Upgrade otel image to 0.37.0

Cover all upstream configuration interface changes: - open-telemetry/opentelemetry-collector-contrib#5384 - open-telemetry/opentelemetry-collector-contrib#5541 - open-telemetry/opentelemetry-log-collection#262
signalfx · Oct 20, 2021 · 1ca7608 · 1ca7608
1 parent a556847
commit 1ca7608
Show file tree

Hide file tree

Showing 49 changed files with 103 additions and 102 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Use only `splunkPlatform.endpoint` and `splunkObservability.realm` parameters
   to identify which destination is enabled, remove default value for
   `splunkObservability.realm` (#230, #233)
+- Upgrade splunk-otel-collector image to 0.37.0 (#237)
 
 ## [0.36.2] - 2021-10-08
 

diff --git a/examples/README.md b/examples/README.md
@@ -71,7 +71,7 @@ otelAgent:
           processors:
             - memory_limiter
             - probabilistic_sampler
-            - k8s_tagger
+            - k8sattributes
             - batch
             - resource
             - resourcedetection

diff --git a/examples/add-sampler-values.yaml b/examples/add-sampler-values.yaml
@@ -15,7 +15,7 @@ otelAgent:
           processors:
             - memory_limiter
             - probabilistic_sampler
-            - k8s_tagger
+            - k8sattributes
             - batch
             - resource
             - resourcedetection
diff --git a/helm-charts/splunk-otel-collector/Chart.yaml b/helm-charts/splunk-otel-collector/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: splunk-otel-collector
 version: 0.36.2
-appVersion: 0.36.0
+appVersion: 0.37.0
 description: Splunk OpenTelemetry Connector for Kubernetes
 icon: https://github.com/signalfx/splunk-otel-collector-chart/tree/main/splunk.png
 type: application

diff --git a/helm-charts/splunk-otel-collector/ci/sampler-gateway-env-vars-java-logs-values.yaml b/helm-charts/splunk-otel-collector/ci/sampler-gateway-env-vars-java-logs-values.yaml
@@ -15,7 +15,7 @@ otelAgent:
           processors:
             - memory_limiter
             - probabilistic_sampler
-            - k8s_tagger
+            - k8sattributes
             - batch
             - resource
             - resourcedetection

diff --git a/helm-charts/splunk-otel-collector/templates/config/_common.tpl b/helm-charts/splunk-otel-collector/templates/config/_common.tpl
@@ -127,19 +127,19 @@ splunk_hec/platform_logs:
   max_connections: {{ .Values.splunkPlatform.max_connections }}
   disable_compression: {{ .Values.splunkPlatform.disable_compression }}
   timeout: {{ .Values.splunkPlatform.timeout }}
-  insecure: {{ .Values.splunkPlatform.insecure }}
-  insecure_skip_verify: {{ .Values.splunkPlatform.insecure_skip_verify }}
   splunk_app_name: {{ .Chart.Name }}
   splunk_app_version: {{ .Chart.Version }}
-  {{- if .Values.splunkPlatform.clientCert }}
-  cert_file: /otel/etc/hec_client_cert
-  {{- end }}
-  {{- if .Values.splunkPlatform.clientKey  }}
-  key_file: /otel/etc/hec_client_key
-  {{- end }}
-  {{- if .Values.splunkPlatform.caFile }}
-  ca_file: /otel/etc/hec_ca_file
-  {{- end }}
+  tls:
+    insecure_skip_verify: {{ .Values.splunkPlatform.insecure_skip_verify }}
+    {{- if .Values.splunkPlatform.clientCert }}
+    cert_file: /otel/etc/hec_client_cert
+    {{- end }}
+    {{- if .Values.splunkPlatform.clientKey  }}
+    key_file: /otel/etc/hec_client_key
+    {{- end }}
+    {{- if .Values.splunkPlatform.caFile }}
+    ca_file: /otel/etc/hec_ca_file
+    {{- end }}
 {{- end }}
 
 {{/*
@@ -155,17 +155,17 @@ splunk_hec/platform_metrics:
   max_connections: {{ .Values.splunkPlatform.max_connections }}
   disable_compression: {{ .Values.splunkPlatform.disable_compression }}
   timeout: {{ .Values.splunkPlatform.timeout }}
-  insecure: {{ .Values.splunkPlatform.insecure }}
-  insecure_skip_verify: {{ .Values.splunkPlatform.insecure_skip_verify }}
   splunk_app_name: {{ .Chart.Name }}
   splunk_app_version: {{ .Chart.Version }}
-  {{- if .Values.splunkPlatform.clientCert }}
-  cert_file: /otel/etc/hec_client_cert
-  {{- end }}
-  {{- if .Values.splunkPlatform.clientKey  }}
-  key_file: /otel/etc/hec_client_key
-  {{- end }}
-  {{- if .Values.splunkPlatform.caFile }}
-  ca_file: /otel/etc/hec_ca_file
-  {{- end }}
+  tls:
+    insecure_skip_verify: {{ .Values.splunkPlatform.insecure_skip_verify }}
+    {{- if .Values.splunkPlatform.clientCert }}
+    cert_file: /otel/etc/hec_client_cert
+    {{- end }}
+    {{- if .Values.splunkPlatform.clientKey  }}
+    key_file: /otel/etc/hec_client_key
+    {{- end }}
+    {{- if .Values.splunkPlatform.caFile }}
+    ca_file: /otel/etc/hec_ca_file
+    {{- end }}
 {{- end }}
diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl
@@ -119,7 +119,7 @@ receivers:
     include_file_name: false
     poll_interval: 200ms
     max_concurrent_files: 1024
-    encoding: nop
+    encoding: utf-8
     fingerprint_size: 1kb
     max_log_size: 1MiB
     operators:
@@ -233,10 +233,10 @@ receivers:
               to: $$
   {{- end }}
 
-# By default k8s_tagger and batch processors enabled.
+# By default k8sattributes and batch processors enabled.
 processors:
-  # k8s_tagger enriches traces and metrics with k8s metadata
-  k8s_tagger:
+  # k8sattributes enriches traces and metrics with k8s metadata
+  k8sattributes:
     # If standalone collector deployment is enabled, the `passthrough` configuration is enabled by default.
     # It means that traces and metrics enrichment happens in collector, and the agent only passes information
     # about traces and metrics source, without calling k8s API.
@@ -420,7 +420,7 @@ service:
         {{- if .Values.fluentd.enabled }}
         - groupbyattrs/logs
         {{- end }}
-        - k8s_tagger
+        - k8sattributes
         - batch
         {{- if not .Values.otelCollector.enabled }}
         - filter/logs
@@ -450,7 +450,7 @@ service:
       receivers: [otlp, jaeger, smartagent/signalfx-forwarder, zipkin]
       processors:
         - memory_limiter
-        - k8s_tagger
+        - k8sattributes
         - batch
         - resource
         - resourcedetection

diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl
@@ -31,9 +31,9 @@ receivers:
     endpoint: 0.0.0.0:9943
     access_token_passthrough: true
 
-# By default k8s_tagger, memory_limiter and batch processors enabled.
+# By default k8sattributes, memory_limiter and batch processors enabled.
 processors:
-  k8s_tagger:
+  k8sattributes:
     pod_association:
       - from: resource_attribute
         name: k8s.pod.uid
@@ -162,7 +162,7 @@ service:
       processors:
         - memory_limiter
         - batch
-        - k8s_tagger
+        - k8sattributes
         {{- if .Values.clusterName }}
         - resource/add_cluster_name
         {{- end }}
@@ -211,7 +211,7 @@ service:
       receivers: [otlp]
       processors:
         - memory_limiter
-        - k8s_tagger
+        - k8sattributes
         - batch
         - filter/logs
         - resource/logs

diff --git a/rendered/manifests/agent-only/clusterRole.yaml b/rendered/manifests/agent-only/clusterRole.yaml
@@ -9,7 +9,7 @@ metadata:
     helm.sh/chart: splunk-otel-collector-0.36.2
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: "0.36.0"
+    app.kubernetes.io/version: "0.37.0"
     app: splunk-otel-collector
     chart: splunk-otel-collector-0.36.2
     release: default

diff --git a/rendered/manifests/agent-only/clusterRoleBinding.yaml b/rendered/manifests/agent-only/clusterRoleBinding.yaml
@@ -9,7 +9,7 @@ metadata:
     helm.sh/chart: splunk-otel-collector-0.36.2
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: "0.36.0"
+    app.kubernetes.io/version: "0.37.0"
     app: splunk-otel-collector
     chart: splunk-otel-collector-0.36.2
     release: default

diff --git a/rendered/manifests/agent-only/configmap-fluentd-cri.yaml b/rendered/manifests/agent-only/configmap-fluentd-cri.yaml
@@ -9,7 +9,7 @@ metadata:
     helm.sh/chart: splunk-otel-collector-0.36.2
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: "0.36.0"
+    app.kubernetes.io/version: "0.37.0"
     app: splunk-otel-collector
     chart: splunk-otel-collector-0.36.2
     release: default

diff --git a/rendered/manifests/agent-only/configmap-fluentd-json.yaml b/rendered/manifests/agent-only/configmap-fluentd-json.yaml
@@ -9,7 +9,7 @@ metadata:
     helm.sh/chart: splunk-otel-collector-0.36.2
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: "0.36.0"
+    app.kubernetes.io/version: "0.37.0"
     app: splunk-otel-collector
     chart: splunk-otel-collector-0.36.2
     release: default

diff --git a/rendered/manifests/agent-only/configmap-fluentd.yaml b/rendered/manifests/agent-only/configmap-fluentd.yaml
@@ -9,7 +9,7 @@ metadata:
     helm.sh/chart: splunk-otel-collector-0.36.2
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: "0.36.0"
+    app.kubernetes.io/version: "0.37.0"
     app: splunk-otel-collector
     chart: splunk-otel-collector-0.36.2
     release: default

diff --git a/rendered/manifests/agent-only/configmap-otel-agent.yaml b/rendered/manifests/agent-only/configmap-otel-agent.yaml
@@ -9,7 +9,7 @@ metadata:
     helm.sh/chart: splunk-otel-collector-0.36.2
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: "0.36.0"
+    app.kubernetes.io/version: "0.37.0"
     app: splunk-otel-collector
     chart: splunk-otel-collector-0.36.2
     release: default
@@ -56,7 +56,7 @@ data:
         - k8s.namespace.name
         - k8s.pod.name
         - k8s.pod.uid
-      k8s_tagger:
+      k8sattributes:
         extract:
           annotations:
           - from: pod
@@ -191,7 +191,7 @@ data:
           processors:
           - memory_limiter
           - groupbyattrs/logs
-          - k8s_tagger
+          - k8sattributes
           - batch
           - filter/logs
           - resource/logs
@@ -230,7 +230,7 @@ data:
           - signalfx
           processors:
           - memory_limiter
-          - k8s_tagger
+          - k8sattributes
           - batch
           - resource
           - resourcedetection

diff --git a/rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml b/rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml
@@ -9,7 +9,7 @@ metadata:
     helm.sh/chart: splunk-otel-collector-0.36.2
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: "0.36.0"
+    app.kubernetes.io/version: "0.37.0"
     app: splunk-otel-collector
     chart: splunk-otel-collector-0.36.2
     release: default

diff --git a/rendered/manifests/agent-only/daemonset.yaml b/rendered/manifests/agent-only/daemonset.yaml
@@ -9,7 +9,7 @@ metadata:
     helm.sh/chart: splunk-otel-collector-0.36.2
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: "0.36.0"
+    app.kubernetes.io/version: "0.37.0"
     app: splunk-otel-collector
     chart: splunk-otel-collector-0.36.2
     release: default
@@ -28,7 +28,7 @@ spec:
         app: splunk-otel-collector
         release: default
       annotations:
-        checksum/config: cef48b767e631d425658c60adebc14c32a17a4c2acd58ea03c4dce0f339e1247
+        checksum/config: 7046b15271336873e77b7dae353d9bd71ab4dec553a460d440913ca294d30c5b
     spec:
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet
@@ -145,7 +145,7 @@ spec:
           containerPort: 9411
           hostPort: 9411
           protocol: TCP
-        image: quay.io/signalfx/splunk-otel-collector:0.36.0
+        image: quay.io/signalfx/splunk-otel-collector:0.37.0
         imagePullPolicy: IfNotPresent
         env:
           - name: K8S_NODE_NAME

diff --git a/rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml b/rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml
@@ -9,7 +9,7 @@ metadata:
     helm.sh/chart: splunk-otel-collector-0.36.2
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: "0.36.0"
+    app.kubernetes.io/version: "0.37.0"
     app: splunk-otel-collector
     component: otel-k8s-cluster-receiver
     chart: splunk-otel-collector-0.36.2
@@ -30,7 +30,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: f5a6a679a375a94a44d7cfe43a799099e874ce6510cf7e250d5bc69709fa911a
+        checksum/config: 7e2657de4432f54f2fffffd3bc51d863b6e6d76f400a1d02aea026edfcc98894
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:
@@ -41,7 +41,7 @@ spec:
         - /otelcol
         - --config=/conf/relay.yaml
         - --metrics-addr=0.0.0.0:8889
-        image: quay.io/signalfx/splunk-otel-collector:0.36.0
+        image: quay.io/signalfx/splunk-otel-collector:0.37.0
         imagePullPolicy: IfNotPresent
         env:
           - name: SPLUNK_MEMORY_TOTAL_MIB

diff --git a/rendered/manifests/agent-only/secret.yaml b/rendered/manifests/agent-only/secret.yaml
@@ -9,7 +9,7 @@ metadata:
     helm.sh/chart: splunk-otel-collector-0.36.2
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: "0.36.0"
+    app.kubernetes.io/version: "0.37.0"
     app: splunk-otel-collector
     chart: splunk-otel-collector-0.36.2
     release: default

diff --git a/rendered/manifests/agent-only/serviceAccount.yaml b/rendered/manifests/agent-only/serviceAccount.yaml
@@ -9,7 +9,7 @@ metadata:
     helm.sh/chart: splunk-otel-collector-0.36.2
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: "0.36.0"
+    app.kubernetes.io/version: "0.37.0"
     app: splunk-otel-collector
     chart: splunk-otel-collector-0.36.2
     release: default

diff --git a/rendered/manifests/gateway-only/clusterRole.yaml b/rendered/manifests/gateway-only/clusterRole.yaml
@@ -9,7 +9,7 @@ metadata:
     helm.sh/chart: splunk-otel-collector-0.36.2
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: "0.36.0"
+    app.kubernetes.io/version: "0.37.0"
     app: splunk-otel-collector
     chart: splunk-otel-collector-0.36.2
     release: default

diff --git a/rendered/manifests/gateway-only/clusterRoleBinding.yaml b/rendered/manifests/gateway-only/clusterRoleBinding.yaml
@@ -9,7 +9,7 @@ metadata:
     helm.sh/chart: splunk-otel-collector-0.36.2
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: "0.36.0"
+    app.kubernetes.io/version: "0.37.0"
     app: splunk-otel-collector
     chart: splunk-otel-collector-0.36.2
     release: default

diff --git a/rendered/manifests/gateway-only/configmap-otel-collector.yaml b/rendered/manifests/gateway-only/configmap-otel-collector.yaml
@@ -9,7 +9,7 @@ metadata:
     helm.sh/chart: splunk-otel-collector-0.36.2
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-    app.kubernetes.io/version: "0.36.0"
+    app.kubernetes.io/version: "0.37.0"
     app: splunk-otel-collector
     chart: splunk-otel-collector-0.36.2
     release: default
@@ -43,7 +43,7 @@ data:
             resource_attributes:
             - key: splunk.com/exclude
               value: "true"
-      k8s_tagger:
+      k8sattributes:
         extract:
           annotations:
           - from: pod
@@ -146,7 +146,7 @@ data:
           - splunk_hec/o11y
           processors:
           - memory_limiter
-          - k8s_tagger
+          - k8sattributes
           - batch
           - filter/logs
           - resource/logs
@@ -187,7 +187,7 @@ data:
           processors:
           - memory_limiter
           - batch
-          - k8s_tagger
+          - k8sattributes
           - resource/add_cluster_name
           receivers:
           - otlp