From 681718595fce6f94e7b8f369412a07b61db788f5 Mon Sep 17 00:00:00 2001
From: jakub-racek-swi <jakub.racek@solarwinds.com>
Date: Thu, 11 Dec 2025 14:06:19 +0100
Subject: [PATCH] fix: rethink namespace filter

---
 deploy/helm/templates/_helpers.tpl | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/deploy/helm/templates/_helpers.tpl b/deploy/helm/templates/_helpers.tpl
index 149dcc63..ebfe1655 100644
--- a/deploy/helm/templates/_helpers.tpl
+++ b/deploy/helm/templates/_helpers.tpl
@@ -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)) -}}
@@ -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 -}}