changelog

signalfx · Oct 29, 2021 · e17c5ff · e17c5ff
1 parent 087247e
commit e17c5ff
Show file tree

Hide file tree

Showing 36 changed files with 4 additions and 3,388 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Add initContainer for log checkpoint migration from Fluentd to Otel agent (#253)
 - Add index routing for Splunk Enterprise/Cloud customers (#256)
+- Field name compatibility for SCK and index routing precedence (#258)
 
 ## [0.37.0] - 2021-10-26
 

diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl
@@ -346,8 +346,8 @@ processors:
       from_attribute: k8s.namespace.name
       action: upsert
     {{- range $_, $label := .Values.extraAttributes.podLabels }}
-    - key: {{ printf "label_%s" $label.key }}
-      from_attribute: {{ printf "k8s.pod.labels.%s" $label.key }}
+    - key: {{ printf "label_%s" $label }}
+      from_attribute: {{ printf "k8s.pod.labels.%s" $label }}
       action: upsert
     {{- end }}
   {{- end }}
@@ -367,7 +367,7 @@ processors:
     - key: k8s.namespace.name
       action: delete
     {{- range $_, $label := .Values.extraAttributes.podLabels }}
-    - key: {{ printf "k8s.pod.labels.%s" $label.key }}
+    - key: {{ printf "k8s.pod.labels.%s" $label }}
       action: delete
     {{- end }}
   {{- end }}

diff --git a/rendered/manifests/agent-only/clusterRole.yaml b/rendered/manifests/agent-only/clusterRole.yaml
diff --git a/rendered/manifests/agent-only/clusterRoleBinding.yaml b/rendered/manifests/agent-only/clusterRoleBinding.yaml
diff --git a/rendered/manifests/agent-only/configmap-fluentd-cri.yaml b/rendered/manifests/agent-only/configmap-fluentd-cri.yaml
diff --git a/rendered/manifests/agent-only/configmap-fluentd-json.yaml b/rendered/manifests/agent-only/configmap-fluentd-json.yaml