Skip to content

Obi namespace filter regex interaction fix #1239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jakub-racek-swi merged 1 commit into from
Dec 16, 2025
Merged

Obi namespace filter regex interaction fix #1239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions deploy/helm/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,19 +407,17 @@ Usage:
{{- end -}}

{{/*
Returns namespace filters for relationship metrics (OBI and Istio)
Only filters when BOTH source AND destination should be filtered
It preserves relationships where at least one end is in a monitored namespace
Returns namespace filters for relationship metrics (OBI)

Usage:
{{- include "namespacesFilterRelationships" . | nindent 8 }}
*/}}
{{- define "namespacesFilterRelationships" -}}
{{- range .Values.cluster.filter.exclude_namespaces }}
- resource.attributes["source.k8s.namespace.name"] == "{{ . }}" and resource.attributes["dest.k8s.namespace.name"] == "{{ . }}"
- resource.attributes["source.k8s.namespace.name"] == "{{ . }}" or resource.attributes["dest.k8s.namespace.name"] == "{{ . }}"
{{- end }}
{{- range .Values.cluster.filter.exclude_namespaces_regex }}
- IsMatch(resource.attributes["source.k8s.namespace.name"], "{{ . }}") and IsMatch(resource.attributes["dest.k8s.namespace.name"], "{{ . }}")
- IsMatch(resource.attributes["source.k8s.namespace.name"], "{{ . }}") or IsMatch(resource.attributes["dest.k8s.namespace.name"], "{{ . }}")
{{- end }}
# include namespaces have to be merged to one condition with ORs and ANDs
{{- if or (not (empty .Values.cluster.filter.include_namespaces)) (not (empty .Values.cluster.filter.include_namespaces_regex)) -}}
Expand All @@ -435,11 +433,9 @@ Usage:
{{- $srcConditions = append $srcConditions (printf `IsMatch(resource.attributes["source.k8s.namespace.name"], "%s")` $value) }}
{{- $dstConditions = append $dstConditions (printf `IsMatch(resource.attributes["dest.k8s.namespace.name"], "%s")` $value) }}
{{- end }}
{{- $srcConditions = append $srcConditions `resource.attributes["source.k8s.namespace.name"] == nil` }}
{{- $dstConditions = append $dstConditions `resource.attributes["dest.k8s.namespace.name"] == nil` }}
{{- $srcJoined := join " or " $srcConditions }}
{{- $dstJoined := join " or " $dstConditions }}
- not({{ $srcJoined }}) and not({{ $dstJoined }})
- not(({{ $srcJoined }} and {{ $dstJoined }}) or ({{ $srcJoined }} and resource.attributes["dest.k8s.namespace.name"] == nil) or ({{ $dstJoined }} and resource.attributes["source.k8s.namespace.name"] == nil))
{{- end -}}
{{- end -}}

Expand Down
Loading