diff --git a/deploy/helm/sumologic/conf/traces/traces.otelcol.conf.yaml b/deploy/helm/sumologic/conf/traces/traces.otelcol.conf.yaml index 6297df7c1c..35f5fb8d79 100644 --- 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 index c719576240..f9b836fe28 100644 --- 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 index 9a94b328b5..e0a797ba17 100644 --- 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: