fix: use fluentd.excludeNamespaces helm template, also for tracing co…

…nfig
SumoLogic · Oct 26, 2021 · 863def2 · 863def2
1 parent cde4e6c
commit 863def2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 16 deletions.
diff --git a/deploy/helm/sumologic/conf/logs/fluentd/logs.source.containers.conf b/deploy/helm/sumologic/conf/logs/fluentd/logs.source.containers.conf
@@ -66,15 +66,7 @@
   <filter containers.**>
     @type kubernetes_sumologic
     @include logs.kubernetes.sumologic.filter.conf
-    {{- if eq .Values.sumologic.collectionMonitoring false }}
-    {{- if .Values.fluentd.logs.containers.excludeNamespaceRegex }}
-    exclude_namespace_regex {{ printf "%s|%s" .Release.Namespace .Values.fluentd.logs.containers.excludeNamespaceRegex | quote }}
-    {{- else }}
-    exclude_namespace_regex {{ printf "%s" .Release.Namespace | quote }}
-    {{- end }}
-    {{- else }}
-    exclude_namespace_regex {{ .Values.fluentd.logs.containers.excludeNamespaceRegex | quote }}
-    {{- end }}
+    exclude_namespace_regex {{ include "fluentd.excludeNamespaces" . }}
   </filter>
 {{- .Values.fluentd.logs.containers.extraOutputPluginConf | nindent 4 }}
   {{ if .Values.fluentd.logs.containers.overrideOutputConf }}

diff --git a/deploy/helm/sumologic/conf/traces/traces.otelcol.conf.yaml b/deploy/helm/sumologic/conf/traces/traces.otelcol.conf.yaml
@@ -4,10 +4,7 @@
 {{- $sourceCategory := .Values.fluentd.logs.containers.sourceCategory | quote }}
 {{- $sourceCategoryPrefix := .Values.fluentd.logs.containers.sourceCategoryPrefix | quote }}
 {{- $sourceCategoryReplaceDash := .Values.fluentd.logs.containers.sourceCategoryReplaceDash | quote }}
-{{- $excludeNamespaceRegex := .Values.fluentd.logs.containers.excludeNamespaceRegex | quote }}
-{{ if eq .Values.sumologic.collectionMonitoring false }}
-  {{- $excludeNamespaceRegex = printf "%s|%s" .Release.Namespace .Values.fluentd.logs.containers.excludeNamespaceRegex | quote }}
-{{- end }}
+{{- $excludeNamespaceRegex := include "fluentd.excludeNamespaces" . }}
 {{- $excludePodRegex := .Values.fluentd.logs.containers.excludePodRegex | quote }}
 {{- $excludeContainerRegex := .Values.fluentd.logs.containers.excludeContainerRegex | quote }}
 {{- $excludeHostRegex := .Values.fluentd.logs.containers.excludeHostRegex | quote }}

diff --git a/deploy/helm/sumologic/templates/_helpers.tpl b/deploy/helm/sumologic/templates/_helpers.tpl
@@ -1036,7 +1036,11 @@ Example:
 {{- define "fluentd.excludeNamespaces" -}}
 {{- $excludeNamespaceRegex := .Values.fluentd.logs.containers.excludeNamespaceRegex | quote -}}
 {{- if eq .Values.sumologic.collectionMonitoring false -}}
-  {{- $excludeNamespaceRegex = printf "%s|%s" .Release.Namespace .Values.fluentd.logs.containers.excludeNamespaceRegex | quote }}
+  {{- if .Values.fluentd.logs.containers.excludeNamespaceRegex -}}
+  {{- $excludeNamespaceRegex = printf "%s|%s" .Release.Namespace .Values.fluentd.logs.containers.excludeNamespaceRegex | quote -}}
+  {{- else -}}
+  {{- $excludeNamespaceRegex = printf "%s" .Release.Namespace | quote -}}
+  {{- end -}}
 {{- end -}}
 {{ print $excludeNamespaceRegex }}
 {{- end -}}

diff --git a/tests/tracing/static/collection-monitoring-false.output.yaml b/tests/tracing/static/collection-monitoring-false.output.yaml
@@ -11,7 +11,6 @@ metadata:
     heritage: "Helm"
 data:
   traces.otelcol.conf.yaml: |
-    
     exporters:
       otlphttp:
         compression: gzip

diff --git a/tests/tracing/static/simple.output.yaml b/tests/tracing/static/simple.output.yaml
@@ -11,7 +11,6 @@ metadata:
     heritage: "Helm"
 data:
   traces.otelcol.conf.yaml: |
-    
     exporters:
       otlphttp:
         compression: gzip