Fix .Values.sumologic.sourceName for OTC in Helm chart

Signed-off-by: Patryk Matyjasek <pmatyjasek@sumologic.com>
SumoLogic · Jul 13, 2021 · 1ad05e9 · 1ad05e9
1 parent ac366ed
commit 1ad05e9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/deploy/helm/sumologic/conf/traces/traces.otelcol.conf.yaml b/deploy/helm/sumologic/conf/traces/traces.otelcol.conf.yaml
@@ -1,9 +1,9 @@
 {{- $yamlFile := toYaml $.Values.otelcol.config }}
 {{- $_collector := .Values.sumologic.collectorName | default .Values.sumologic.clusterName | quote }}
-{{- $sourceName := .Values.sumologic.sourceName | quote }}
-{{- $sourceCategory := .Values.sumologic.sourceCategory | quote }}
-{{- $sourceCategoryPrefix := .Values.sumologic.sourceCategoryPrefix | quote }}
-{{- $sourceCategoryReplaceDash := .Values.sumologic.sourceCategoryReplaceDash | quote }}
+{{- $sourceName := .Values.fluentd.logs.containers.sourceName | quote }}
+{{- $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 }}

diff --git a/tests/tracing/static/collection-monitoring-false.output.yaml b/tests/tracing/static/collection-monitoring-false.output.yaml
@@ -85,11 +85,11 @@ data:
         pod_key: k8s.pod.name
         pod_name_key: k8s.pod.pod_name
         pod_template_hash_key: k8s.pod.label.pod-template-hash
-        source_category: 
-        source_category_prefix: 
-        source_category_replace_dash: 
+        source_category: "%{namespace}/%{pod_name}"
+        source_category_prefix: "kubernetes/"
+        source_category_replace_dash: "/"
         source_host_key: k8s.pod.hostname
-        source_name: 
+        source_name: "%{namespace}.%{pod}.%{container}"
     receivers:
       jaeger:
         protocols:

diff --git a/tests/tracing/static/simple.output.yaml b/tests/tracing/static/simple.output.yaml
@@ -85,11 +85,11 @@ data:
         pod_key: k8s.pod.name
         pod_name_key: k8s.pod.pod_name
         pod_template_hash_key: k8s.pod.label.pod-template-hash
-        source_category: 
-        source_category_prefix: 
-        source_category_replace_dash: 
+        source_category: "%{namespace}/%{pod_name}"
+        source_category_prefix: "kubernetes/"
+        source_category_replace_dash: "/"
         source_host_key: k8s.pod.hostname
-        source_name: 
+        source_name: "%{namespace}.%{pod}.%{container}"
     receivers:
       jaeger:
         protocols: