From de64cdd00909f6a77c9c8a1fcda9ea6445f69bed Mon Sep 17 00:00:00 2001
From: Katarzyna Kujawa <kkujawa@sumologic.com>
Date: Wed, 16 Nov 2022 14:21:19 +0100
Subject: [PATCH] Revert changes introduced in #1721

---
 .../conf/traces/traces.otelcol.conf.yaml      | 27 +------------------
 deploy/helm/sumologic/templates/_helpers.tpl  | 13 ---------
 deploy/helm/sumologic/values.yaml             | 24 ++++++++---------
 3 files changed, 13 insertions(+), 51 deletions(-)

diff --git a/deploy/helm/sumologic/conf/traces/traces.otelcol.conf.yaml b/deploy/helm/sumologic/conf/traces/traces.otelcol.conf.yaml
index c899cb193d..c36af0b9a0 100644
--- a/deploy/helm/sumologic/conf/traces/traces.otelcol.conf.yaml
+++ b/deploy/helm/sumologic/conf/traces/traces.otelcol.conf.yaml
@@ -1,26 +1 @@
-{{- $yamlFile := toYaml $.Values.otelcol.config }}
-{{- $_collector := .Values.sumologic.collectorName | default .Values.sumologic.clusterName | quote }}
-{{- $sourceName := .Values.otelcol.sourceMetadata.sourceName | quote }}
-{{- $sourceCategory := .Values.otelcol.sourceMetadata.sourceCategory | quote }}
-{{- $sourceCategoryPrefix := .Values.otelcol.sourceMetadata.sourceCategoryPrefix | quote }}
-{{- $sourceCategoryReplaceDash := .Values.otelcol.sourceMetadata.sourceCategoryReplaceDash | quote }}
-{{- $excludeNamespaceRegex := .Values.otelcol.sourceMetadata.excludeNamespaceRegex | quote }}
-{{- $excludePodRegex := .Values.otelcol.sourceMetadata.excludePodRegex | quote }}
-{{- $excludeContainerRegex := .Values.otelcol.sourceMetadata.excludeContainerRegex | quote }}
-{{- $excludeHostRegex := .Values.otelcol.sourceMetadata.excludeHostRegex | quote }}
-{{- $clusterName := include "sumologic.clusterNameReplaceSpaceWithDash" . }}
-
-{{- $yamlFile := replace "processors.source.collector.replace" $_collector $yamlFile }}
-{{- $yamlFile := replace "processors.source.name.replace" $sourceName $yamlFile }}
-{{- $yamlFile := replace "processors.source.category.replace" $sourceCategory $yamlFile }}
-{{- $yamlFile := replace "processors.source.category_prefix.replace" $sourceCategoryPrefix $yamlFile }}
-{{- $yamlFile := replace "processors.source.category_replace_dash.replace" $sourceCategoryReplaceDash $yamlFile }}
-{{- $yamlFile := replace "processors.source.exclude_namespace_regex.replace" $excludeNamespaceRegex $yamlFile }}
-{{- $yamlFile := replace "processors.source.exclude_pod_regex.replace" $excludePodRegex $yamlFile }}
-{{- $yamlFile := replace "processors.source.exclude_container_regex.replace" $excludeContainerRegex $yamlFile }}
-{{- $yamlFile := replace "processors.source.exclude_host_regex.replace" $excludeHostRegex $yamlFile }}
-{{- $yamlFile := replace "processors.resource.cluster.replace" $clusterName $yamlFile }}
-{{- $yamlFile := replace "exporters.sumologic.source_name.replace" $sourceName $yamlFile }}
-{{- $yamlFile := replace "exporters.sumologic.source_category.replace" $sourceCategory $yamlFile }}
-
-{{- tpl ($yamlFile | replace ": '{{" ": {{" | replace "}}'" "}}") . | nindent 2 }}
+{{- tpl (toYaml .Values.otelcol.config | replace ": '{{" ": {{" | replace "}}'" "}}") . | nindent 2 }}
diff --git a/deploy/helm/sumologic/templates/_helpers.tpl b/deploy/helm/sumologic/templates/_helpers.tpl
index 4b4086169a..042aca3761 100644
--- a/deploy/helm/sumologic/templates/_helpers.tpl
+++ b/deploy/helm/sumologic/templates/_helpers.tpl
@@ -1240,19 +1240,6 @@ Example:
 {{- print $annotations_match }}
 {{- end -}}
 
-
-{{/*
-Return k8s.cluster.name for opentelemetry collector
-
-Example:
-
-{{ include "otelcol.k8s.cluster.name" . }}
-*/}}
-{{- define "otelcol.k8s.cluster.name" -}}
-{{ .Values.sumologic.collectorName | default .Values.sumologic.clusterName | quote }}
-{{- end -}}
-
-
 {{/*
 Returns list of namespaces to exclude
 
diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
index a4a78b8285..fa37f2d898 100644
--- a/deploy/helm/sumologic/values.yaml
+++ b/deploy/helm/sumologic/values.yaml
@@ -3561,26 +3561,26 @@ otelcol:
       ## Source processor adds Sumo Logic related metadata
       source:
         annotation_prefix: "k8s.pod.annotation."
-        collector: "processors.source.collector.replace"
+        collector: '{{ .Values.sumologic.collectorName | default .Values.sumologic.clusterName | quote }}'
         exclude:
-          k8s.container.name: "processors.source.exclude_container_regex.replace"
-          k8s.host.name: "processors.source.exclude_host_regex.replace"
-          k8s.namespace.name: "processors.source.exclude_namespace_regex.replace"
-          k8s.pod.name: "processors.source.exclude_pod_regex.replace"
+          k8s.container.name: '{{ .Values.fluentd.logs.containers.excludeContainerRegex | quote }}'
+          k8s.host.name: '{{ .Values.fluentd.logs.containers.excludeHostRegex | quote }}'
+          k8s.namespace.name: '{{ include "fluentd.excludeNamespaces" . }}'
+          k8s.pod.name: '{{ .Values.fluentd.logs.containers.excludePodRegex | quote }}'
         pod_key: "k8s.pod.name"
         pod_name_key: "k8s.pod.pod_name"
         pod_template_hash_key: "k8s.pod.label.pod-template-hash"
-        source_category: "processors.source.category.replace"
-        source_category_prefix: "processors.source.category_prefix.replace"
-        source_category_replace_dash: "processors.source.category_replace_dash.replace"
+        source_category: '{{ .Values.fluentd.logs.containers.sourceCategory | quote }}'
+        source_category_prefix: '{{ .Values.fluentd.logs.containers.sourceCategoryPrefix | quote }}'
+        source_category_replace_dash: '{{ .Values.fluentd.logs.containers.sourceCategoryReplaceDash | quote }}'
         source_host: "%{k8s.pod.hostname}"
-        source_name: "processors.source.name.replace"
+        source_name:  '{{ .Values.fluentd.logs.containers.sourceName | quote }}'
 
       ## Resource processor sets the associted cluster attribute
       resource:
         attributes:
           - key: k8s.cluster.name
-            value: "processors.resource.cluster.replace"
+            value: '{{ .Values.sumologic.collectorName | default .Values.sumologic.clusterName | quote }}'
             action: upsert
 
       ## The memory_limiter processor is used to prevent out of memory situations on the collector.
@@ -3645,9 +3645,9 @@ otelcol:
         ## carbon2 and graphite are going to be supported soon.
         metric_format: prometheus
         ## Desired source category. Useful if you want to override the source category configured for the source.
-        source_category: "exporters.sumologic.source_category.replace"
+        source_category: '{{ .Values.otelcol.sourceMetadata.sourceCategory | quote }}'
         ## Desired source name. Useful if you want to override the source name configured for the source.
-        source_name: "exporters.sumologic.source_name.replace"
+        source_name: '{{ .Values.otelcol.sourceMetadata.sourceName | quote }}'
         ## Desired host name. Useful if you want to override the source host configured for the source.
         source_host: "%{k8s.pod.hostname}"
         ## Timeout for every attempt to send data to Sumo Logic backend. Maximum connection timeout is 55s.