From 1ca76087ac632e666b79fdc15cbed4f5db2ea72d Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Oct 2021 18:11:59 -0700 Subject: [PATCH] Upgrade otel image to 0.37.0 Cover all upstream configuration interface changes: - https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/5384 - https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/5541 - https://github.com/open-telemetry/opentelemetry-log-collection/pull/262 --- CHANGELOG.md | 1 + examples/README.md | 2 +- examples/add-sampler-values.yaml | 2 +- helm-charts/splunk-otel-collector/Chart.yaml | 2 +- ...ler-gateway-env-vars-java-logs-values.yaml | 2 +- .../templates/config/_common.tpl | 44 +++++++++---------- .../templates/config/_otel-agent.tpl | 12 ++--- .../templates/config/_otel-collector.tpl | 8 ++-- .../manifests/agent-only/clusterRole.yaml | 2 +- .../agent-only/clusterRoleBinding.yaml | 2 +- .../agent-only/configmap-fluentd-cri.yaml | 2 +- .../agent-only/configmap-fluentd-json.yaml | 2 +- .../agent-only/configmap-fluentd.yaml | 2 +- .../agent-only/configmap-otel-agent.yaml | 8 ++-- .../configmap-otel-k8s-cluster-receiver.yaml | 2 +- rendered/manifests/agent-only/daemonset.yaml | 6 +-- .../deployment-k8s-cluster-receiver.yaml | 6 +-- rendered/manifests/agent-only/secret.yaml | 2 +- .../manifests/agent-only/serviceAccount.yaml | 2 +- .../manifests/gateway-only/clusterRole.yaml | 2 +- .../gateway-only/clusterRoleBinding.yaml | 2 +- .../configmap-otel-collector.yaml | 8 ++-- .../gateway-only/deployment-collector.yaml | 6 +-- rendered/manifests/gateway-only/secret.yaml | 2 +- rendered/manifests/gateway-only/service.yaml | 2 +- .../gateway-only/serviceAccount.yaml | 2 +- rendered/manifests/logs-only/clusterRole.yaml | 2 +- .../logs-only/clusterRoleBinding.yaml | 2 +- .../logs-only/configmap-fluentd-cri.yaml | 2 +- .../logs-only/configmap-fluentd-json.yaml | 2 +- .../logs-only/configmap-fluentd.yaml | 2 +- .../logs-only/configmap-otel-agent.yaml | 6 +-- rendered/manifests/logs-only/daemonset.yaml | 6 +-- rendered/manifests/logs-only/secret.yaml | 2 +- .../manifests/logs-only/serviceAccount.yaml | 2 +- .../manifests/metrics-only/clusterRole.yaml | 2 +- .../metrics-only/clusterRoleBinding.yaml | 2 +- .../metrics-only/configmap-otel-agent.yaml | 4 +- .../configmap-otel-k8s-cluster-receiver.yaml | 2 +- .../manifests/metrics-only/daemonset.yaml | 6 +-- .../deployment-k8s-cluster-receiver.yaml | 6 +-- rendered/manifests/metrics-only/secret.yaml | 2 +- .../metrics-only/serviceAccount.yaml | 2 +- .../manifests/traces-only/clusterRole.yaml | 2 +- .../traces-only/clusterRoleBinding.yaml | 2 +- .../traces-only/configmap-otel-agent.yaml | 6 +-- rendered/manifests/traces-only/daemonset.yaml | 6 +-- rendered/manifests/traces-only/secret.yaml | 2 +- .../manifests/traces-only/serviceAccount.yaml | 2 +- 49 files changed, 103 insertions(+), 102 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d366d76dd..8aebce4053 100644 --- 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 index 84d5469a7e..b04e631f19 100644 --- 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 index b51023fc11..be8542a44a 100644 --- 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 index d2513c8c01..2efcd78e55 100644 --- 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 index fa7b0377fe..2739c6b79c 100644 --- 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 index dafdeeac22..1f03fd6066 100644 --- 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 index ec0a7a8d9b..b124ec7282 100644 --- 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 index a95fc80fb0..df5dd476ca 100644 --- 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 index 5db5dc5332..a50ebdea66 100644 --- 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 index 8e0be1755a..1f55d90ea5 100644 --- 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 index 3149f88af4..413af34ba3 100644 --- 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 index 79554b55f0..aa284882a6 100644 --- 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 index 1478b40fcc..9afa24b9f4 100644 --- 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 index 1928bba2b3..d16fb2bbe6 100644 --- 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 index b1fce33bb4..84ed96dc63 100644 --- 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 index 0959d8ab5d..ab0a066c71 100644 --- 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 index b0b163af44..9c704adbb0 100644 --- 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 index ee693ce5bb..02fc01438e 100644 --- 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 index 87c2e88f31..ee288617c4 100644 --- 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 index 5db5dc5332..a50ebdea66 100644 --- 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 index 8e0be1755a..1f55d90ea5 100644 --- 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 index a6bdad0d65..f0e76ee9e0 100644 --- 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 diff --git a/rendered/manifests/gateway-only/deployment-collector.yaml b/rendered/manifests/gateway-only/deployment-collector.yaml index 63ceb749e7..b37902745f 100644 --- a/rendered/manifests/gateway-only/deployment-collector.yaml +++ b/rendered/manifests/gateway-only/deployment-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 component: otel-collector chart: splunk-otel-collector-0.36.2 @@ -30,7 +30,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: f2d2075544880c27ea8f325c4c9ccb1722d45043e2b45949b1bc5e2e0c49e7fd + checksum/config: 68815a7328d29288d3a9c09989ae0a9d1023732c67463b76ad3356f8cf04c8e1 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/gateway-only/secret.yaml b/rendered/manifests/gateway-only/secret.yaml index ee693ce5bb..02fc01438e 100644 --- a/rendered/manifests/gateway-only/secret.yaml +++ b/rendered/manifests/gateway-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/gateway-only/service.yaml b/rendered/manifests/gateway-only/service.yaml index a8e16a3c78..51602adb25 100644 --- a/rendered/manifests/gateway-only/service.yaml +++ b/rendered/manifests/gateway-only/service.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-collector chart: splunk-otel-collector-0.36.2 diff --git a/rendered/manifests/gateway-only/serviceAccount.yaml b/rendered/manifests/gateway-only/serviceAccount.yaml index 87c2e88f31..ee288617c4 100644 --- a/rendered/manifests/gateway-only/serviceAccount.yaml +++ b/rendered/manifests/gateway-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/logs-only/clusterRole.yaml b/rendered/manifests/logs-only/clusterRole.yaml index 5db5dc5332..a50ebdea66 100644 --- a/rendered/manifests/logs-only/clusterRole.yaml +++ b/rendered/manifests/logs-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/logs-only/clusterRoleBinding.yaml b/rendered/manifests/logs-only/clusterRoleBinding.yaml index 8e0be1755a..1f55d90ea5 100644 --- a/rendered/manifests/logs-only/clusterRoleBinding.yaml +++ b/rendered/manifests/logs-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/logs-only/configmap-fluentd-cri.yaml b/rendered/manifests/logs-only/configmap-fluentd-cri.yaml index 3149f88af4..413af34ba3 100644 --- a/rendered/manifests/logs-only/configmap-fluentd-cri.yaml +++ b/rendered/manifests/logs-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/logs-only/configmap-fluentd-json.yaml b/rendered/manifests/logs-only/configmap-fluentd-json.yaml index 79554b55f0..aa284882a6 100644 --- a/rendered/manifests/logs-only/configmap-fluentd-json.yaml +++ b/rendered/manifests/logs-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/logs-only/configmap-fluentd.yaml b/rendered/manifests/logs-only/configmap-fluentd.yaml index 1478b40fcc..9afa24b9f4 100644 --- a/rendered/manifests/logs-only/configmap-fluentd.yaml +++ b/rendered/manifests/logs-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/logs-only/configmap-otel-agent.yaml b/rendered/manifests/logs-only/configmap-otel-agent.yaml index 328b561419..f108a096f5 100644 --- a/rendered/manifests/logs-only/configmap-otel-agent.yaml +++ b/rendered/manifests/logs-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 @@ -53,7 +53,7 @@ data: - k8s.namespace.name - k8s.pod.name - k8s.pod.uid - k8s_tagger: + k8sattributes: extract: annotations: - from: pod @@ -150,7 +150,7 @@ data: processors: - memory_limiter - groupbyattrs/logs - - k8s_tagger + - k8sattributes - batch - filter/logs - resource/logs diff --git a/rendered/manifests/logs-only/daemonset.yaml b/rendered/manifests/logs-only/daemonset.yaml index 7c4dcd7eb3..aded3c6a90 100644 --- a/rendered/manifests/logs-only/daemonset.yaml +++ b/rendered/manifests/logs-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: 4b64e94a258753548aaab4c656d2ffc54fba64c6ba88b1cb6522b87b73f8afb9 + checksum/config: a6fb3caee40d3d0a7a2c7726a0f2f621e9f270c6d56b956bcae8d1ceb8421064 spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet @@ -125,7 +125,7 @@ spec: containerPort: 4317 hostPort: 4317 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/logs-only/secret.yaml b/rendered/manifests/logs-only/secret.yaml index ee693ce5bb..02fc01438e 100644 --- a/rendered/manifests/logs-only/secret.yaml +++ b/rendered/manifests/logs-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/logs-only/serviceAccount.yaml b/rendered/manifests/logs-only/serviceAccount.yaml index 87c2e88f31..ee288617c4 100644 --- a/rendered/manifests/logs-only/serviceAccount.yaml +++ b/rendered/manifests/logs-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/metrics-only/clusterRole.yaml b/rendered/manifests/metrics-only/clusterRole.yaml index 5db5dc5332..a50ebdea66 100644 --- a/rendered/manifests/metrics-only/clusterRole.yaml +++ b/rendered/manifests/metrics-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/metrics-only/clusterRoleBinding.yaml b/rendered/manifests/metrics-only/clusterRoleBinding.yaml index 8e0be1755a..1f55d90ea5 100644 --- a/rendered/manifests/metrics-only/clusterRoleBinding.yaml +++ b/rendered/manifests/metrics-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/metrics-only/configmap-otel-agent.yaml b/rendered/manifests/metrics-only/configmap-otel-agent.yaml index feb7f3fe45..d010fdbff7 100644 --- a/rendered/manifests/metrics-only/configmap-otel-agent.yaml +++ b/rendered/manifests/metrics-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 @@ -50,7 +50,7 @@ data: - k8s.namespace.name - k8s.pod.name - k8s.pod.uid - k8s_tagger: + k8sattributes: extract: annotations: - from: pod diff --git a/rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml b/rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml index b1fce33bb4..84ed96dc63 100644 --- a/rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml +++ b/rendered/manifests/metrics-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/metrics-only/daemonset.yaml b/rendered/manifests/metrics-only/daemonset.yaml index 9007eb8fda..fd32337b54 100644 --- a/rendered/manifests/metrics-only/daemonset.yaml +++ b/rendered/manifests/metrics-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 @@ -27,7 +27,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: 87ff4c7fac89b9febc0c07b2785b1a6c20bed351d8b8c3956dedc8a1fdc138cf + checksum/config: a8c33a8554a33b955562ff9e1e7a2a7c7409c179b04bff5728e9ec1741577d23 spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet @@ -53,7 +53,7 @@ spec: containerPort: 9943 hostPort: 9943 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/metrics-only/deployment-k8s-cluster-receiver.yaml b/rendered/manifests/metrics-only/deployment-k8s-cluster-receiver.yaml index b0b163af44..9c704adbb0 100644 --- a/rendered/manifests/metrics-only/deployment-k8s-cluster-receiver.yaml +++ b/rendered/manifests/metrics-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/metrics-only/secret.yaml b/rendered/manifests/metrics-only/secret.yaml index ee693ce5bb..02fc01438e 100644 --- a/rendered/manifests/metrics-only/secret.yaml +++ b/rendered/manifests/metrics-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/metrics-only/serviceAccount.yaml b/rendered/manifests/metrics-only/serviceAccount.yaml index 87c2e88f31..ee288617c4 100644 --- a/rendered/manifests/metrics-only/serviceAccount.yaml +++ b/rendered/manifests/metrics-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/traces-only/clusterRole.yaml b/rendered/manifests/traces-only/clusterRole.yaml index 5db5dc5332..a50ebdea66 100644 --- a/rendered/manifests/traces-only/clusterRole.yaml +++ b/rendered/manifests/traces-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/traces-only/clusterRoleBinding.yaml b/rendered/manifests/traces-only/clusterRoleBinding.yaml index 8e0be1755a..1f55d90ea5 100644 --- a/rendered/manifests/traces-only/clusterRoleBinding.yaml +++ b/rendered/manifests/traces-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/traces-only/configmap-otel-agent.yaml b/rendered/manifests/traces-only/configmap-otel-agent.yaml index 18e363092f..ebdb14b1d5 100644 --- a/rendered/manifests/traces-only/configmap-otel-agent.yaml +++ b/rendered/manifests/traces-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 @@ -53,7 +53,7 @@ data: - k8s.namespace.name - k8s.pod.name - k8s.pod.uid - k8s_tagger: + k8sattributes: extract: annotations: - from: pod @@ -169,7 +169,7 @@ data: - sapm processors: - memory_limiter - - k8s_tagger + - k8sattributes - batch - resource - resourcedetection diff --git a/rendered/manifests/traces-only/daemonset.yaml b/rendered/manifests/traces-only/daemonset.yaml index 958eb1637d..a0c8611d5a 100644 --- a/rendered/manifests/traces-only/daemonset.yaml +++ b/rendered/manifests/traces-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 @@ -27,7 +27,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: 639b5595bf9c601498a34a069b959c073f0991fba469b3a058267a51fa26ff8a + checksum/config: e18ad46f2914367f00f5da0655f349445f251296a846a9e749368a87aa9809b7 spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet @@ -65,7 +65,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/traces-only/secret.yaml b/rendered/manifests/traces-only/secret.yaml index ee693ce5bb..02fc01438e 100644 --- a/rendered/manifests/traces-only/secret.yaml +++ b/rendered/manifests/traces-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/traces-only/serviceAccount.yaml b/rendered/manifests/traces-only/serviceAccount.yaml index 87c2e88f31..ee288617c4 100644 --- a/rendered/manifests/traces-only/serviceAccount.yaml +++ b/rendered/manifests/traces-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