Skip to content

Commit 1ca7608

Browse files
dmitryaxdmitryax
committed
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
1 parent a556847 commit 1ca7608

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+103
-102
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
1919
- Use only `splunkPlatform.endpoint` and `splunkObservability.realm` parameters
2020
to identify which destination is enabled, remove default value for
2121
`splunkObservability.realm` (#230, #233)
22+
- Upgrade splunk-otel-collector image to 0.37.0 (#237)
2223

2324
## [0.36.2] - 2021-10-08
2425

‎examples/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ otelAgent:
7171
processors:
7272
- memory_limiter
7373
- probabilistic_sampler
74-
- k8s_tagger
74+
- k8sattributes
7575
- batch
7676
- resource
7777
- resourcedetection

‎examples/add-sampler-values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ otelAgent:
1515
processors:
1616
- memory_limiter
1717
- probabilistic_sampler
18-
- k8s_tagger
18+
- k8sattributes
1919
- batch
2020
- resource
2121
- resourcedetection

‎helm-charts/splunk-otel-collector/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: splunk-otel-collector
33
version: 0.36.2
4-
appVersion: 0.36.0
4+
appVersion: 0.37.0
55
description: Splunk OpenTelemetry Connector for Kubernetes
66
icon: https://github.com/signalfx/splunk-otel-collector-chart/tree/main/splunk.png
77
type: application

‎helm-charts/splunk-otel-collector/ci/sampler-gateway-env-vars-java-logs-values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ otelAgent:
1515
processors:
1616
- memory_limiter
1717
- probabilistic_sampler
18-
- k8s_tagger
18+
- k8sattributes
1919
- batch
2020
- resource
2121
- resourcedetection

‎helm-charts/splunk-otel-collector/templates/config/_common.tpl

+22-22
Original file line numberDiff line numberDiff line change
@@ -127,19 +127,19 @@ splunk_hec/platform_logs:
127127
max_connections: {{ .Values.splunkPlatform.max_connections }}
128128
disable_compression: {{ .Values.splunkPlatform.disable_compression }}
129129
timeout: {{ .Values.splunkPlatform.timeout }}
130-
insecure: {{ .Values.splunkPlatform.insecure }}
131-
insecure_skip_verify: {{ .Values.splunkPlatform.insecure_skip_verify }}
132130
splunk_app_name: {{ .Chart.Name }}
133131
splunk_app_version: {{ .Chart.Version }}
134-
{{- if .Values.splunkPlatform.clientCert }}
135-
cert_file: /otel/etc/hec_client_cert
136-
{{- end }}
137-
{{- if .Values.splunkPlatform.clientKey }}
138-
key_file: /otel/etc/hec_client_key
139-
{{- end }}
140-
{{- if .Values.splunkPlatform.caFile }}
141-
ca_file: /otel/etc/hec_ca_file
142-
{{- end }}
132+
tls:
133+
insecure_skip_verify: {{ .Values.splunkPlatform.insecure_skip_verify }}
134+
{{- if .Values.splunkPlatform.clientCert }}
135+
cert_file: /otel/etc/hec_client_cert
136+
{{- end }}
137+
{{- if .Values.splunkPlatform.clientKey }}
138+
key_file: /otel/etc/hec_client_key
139+
{{- end }}
140+
{{- if .Values.splunkPlatform.caFile }}
141+
ca_file: /otel/etc/hec_ca_file
142+
{{- end }}
143143
{{- end }}
144144

145145
{{/*
@@ -155,17 +155,17 @@ splunk_hec/platform_metrics:
155155
max_connections: {{ .Values.splunkPlatform.max_connections }}
156156
disable_compression: {{ .Values.splunkPlatform.disable_compression }}
157157
timeout: {{ .Values.splunkPlatform.timeout }}
158-
insecure: {{ .Values.splunkPlatform.insecure }}
159-
insecure_skip_verify: {{ .Values.splunkPlatform.insecure_skip_verify }}
160158
splunk_app_name: {{ .Chart.Name }}
161159
splunk_app_version: {{ .Chart.Version }}
162-
{{- if .Values.splunkPlatform.clientCert }}
163-
cert_file: /otel/etc/hec_client_cert
164-
{{- end }}
165-
{{- if .Values.splunkPlatform.clientKey }}
166-
key_file: /otel/etc/hec_client_key
167-
{{- end }}
168-
{{- if .Values.splunkPlatform.caFile }}
169-
ca_file: /otel/etc/hec_ca_file
170-
{{- end }}
160+
tls:
161+
insecure_skip_verify: {{ .Values.splunkPlatform.insecure_skip_verify }}
162+
{{- if .Values.splunkPlatform.clientCert }}
163+
cert_file: /otel/etc/hec_client_cert
164+
{{- end }}
165+
{{- if .Values.splunkPlatform.clientKey }}
166+
key_file: /otel/etc/hec_client_key
167+
{{- end }}
168+
{{- if .Values.splunkPlatform.caFile }}
169+
ca_file: /otel/etc/hec_ca_file
170+
{{- end }}
171171
{{- end }}

‎helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl

+6-6
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ receivers:
119119
include_file_name: false
120120
poll_interval: 200ms
121121
max_concurrent_files: 1024
122-
encoding: nop
122+
encoding: utf-8
123123
fingerprint_size: 1kb
124124
max_log_size: 1MiB
125125
operators:
@@ -233,10 +233,10 @@ receivers:
233233
to: $$
234234
{{- end }}
235235
236-
# By default k8s_tagger and batch processors enabled.
236+
# By default k8sattributes and batch processors enabled.
237237
processors:
238-
# k8s_tagger enriches traces and metrics with k8s metadata
239-
k8s_tagger:
238+
# k8sattributes enriches traces and metrics with k8s metadata
239+
k8sattributes:
240240
# If standalone collector deployment is enabled, the `passthrough` configuration is enabled by default.
241241
# It means that traces and metrics enrichment happens in collector, and the agent only passes information
242242
# about traces and metrics source, without calling k8s API.
@@ -420,7 +420,7 @@ service:
420420
{{- if .Values.fluentd.enabled }}
421421
- groupbyattrs/logs
422422
{{- end }}
423-
- k8s_tagger
423+
- k8sattributes
424424
- batch
425425
{{- if not .Values.otelCollector.enabled }}
426426
- filter/logs
@@ -450,7 +450,7 @@ service:
450450
receivers: [otlp, jaeger, smartagent/signalfx-forwarder, zipkin]
451451
processors:
452452
- memory_limiter
453-
- k8s_tagger
453+
- k8sattributes
454454
- batch
455455
- resource
456456
- resourcedetection

‎helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ receivers:
3131
endpoint: 0.0.0.0:9943
3232
access_token_passthrough: true
3333

34-
# By default k8s_tagger, memory_limiter and batch processors enabled.
34+
# By default k8sattributes, memory_limiter and batch processors enabled.
3535
processors:
36-
k8s_tagger:
36+
k8sattributes:
3737
pod_association:
3838
- from: resource_attribute
3939
name: k8s.pod.uid
@@ -162,7 +162,7 @@ service:
162162
processors:
163163
- memory_limiter
164164
- batch
165-
- k8s_tagger
165+
- k8sattributes
166166
{{- if .Values.clusterName }}
167167
- resource/add_cluster_name
168168
{{- end }}
@@ -211,7 +211,7 @@ service:
211211
receivers: [otlp]
212212
processors:
213213
- memory_limiter
214-
- k8s_tagger
214+
- k8sattributes
215215
- batch
216216
- filter/logs
217217
- resource/logs

‎rendered/manifests/agent-only/clusterRole.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
helm.sh/chart: splunk-otel-collector-0.36.2
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/instance: default
12-
app.kubernetes.io/version: "0.36.0"
12+
app.kubernetes.io/version: "0.37.0"
1313
app: splunk-otel-collector
1414
chart: splunk-otel-collector-0.36.2
1515
release: default

‎rendered/manifests/agent-only/clusterRoleBinding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
helm.sh/chart: splunk-otel-collector-0.36.2
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/instance: default
12-
app.kubernetes.io/version: "0.36.0"
12+
app.kubernetes.io/version: "0.37.0"
1313
app: splunk-otel-collector
1414
chart: splunk-otel-collector-0.36.2
1515
release: default

‎rendered/manifests/agent-only/configmap-fluentd-cri.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
helm.sh/chart: splunk-otel-collector-0.36.2
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/instance: default
12-
app.kubernetes.io/version: "0.36.0"
12+
app.kubernetes.io/version: "0.37.0"
1313
app: splunk-otel-collector
1414
chart: splunk-otel-collector-0.36.2
1515
release: default

‎rendered/manifests/agent-only/configmap-fluentd-json.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
helm.sh/chart: splunk-otel-collector-0.36.2
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/instance: default
12-
app.kubernetes.io/version: "0.36.0"
12+
app.kubernetes.io/version: "0.37.0"
1313
app: splunk-otel-collector
1414
chart: splunk-otel-collector-0.36.2
1515
release: default

‎rendered/manifests/agent-only/configmap-fluentd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
helm.sh/chart: splunk-otel-collector-0.36.2
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/instance: default
12-
app.kubernetes.io/version: "0.36.0"
12+
app.kubernetes.io/version: "0.37.0"
1313
app: splunk-otel-collector
1414
chart: splunk-otel-collector-0.36.2
1515
release: default

‎rendered/manifests/agent-only/configmap-otel-agent.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
helm.sh/chart: splunk-otel-collector-0.36.2
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/instance: default
12-
app.kubernetes.io/version: "0.36.0"
12+
app.kubernetes.io/version: "0.37.0"
1313
app: splunk-otel-collector
1414
chart: splunk-otel-collector-0.36.2
1515
release: default
@@ -56,7 +56,7 @@ data:
5656
- k8s.namespace.name
5757
- k8s.pod.name
5858
- k8s.pod.uid
59-
k8s_tagger:
59+
k8sattributes:
6060
extract:
6161
annotations:
6262
- from: pod
@@ -191,7 +191,7 @@ data:
191191
processors:
192192
- memory_limiter
193193
- groupbyattrs/logs
194-
- k8s_tagger
194+
- k8sattributes
195195
- batch
196196
- filter/logs
197197
- resource/logs
@@ -230,7 +230,7 @@ data:
230230
- signalfx
231231
processors:
232232
- memory_limiter
233-
- k8s_tagger
233+
- k8sattributes
234234
- batch
235235
- resource
236236
- resourcedetection

‎rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
helm.sh/chart: splunk-otel-collector-0.36.2
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/instance: default
12-
app.kubernetes.io/version: "0.36.0"
12+
app.kubernetes.io/version: "0.37.0"
1313
app: splunk-otel-collector
1414
chart: splunk-otel-collector-0.36.2
1515
release: default

‎rendered/manifests/agent-only/daemonset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
helm.sh/chart: splunk-otel-collector-0.36.2
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/instance: default
12-
app.kubernetes.io/version: "0.36.0"
12+
app.kubernetes.io/version: "0.37.0"
1313
app: splunk-otel-collector
1414
chart: splunk-otel-collector-0.36.2
1515
release: default
@@ -28,7 +28,7 @@ spec:
2828
app: splunk-otel-collector
2929
release: default
3030
annotations:
31-
checksum/config: cef48b767e631d425658c60adebc14c32a17a4c2acd58ea03c4dce0f339e1247
31+
checksum/config: 7046b15271336873e77b7dae353d9bd71ab4dec553a460d440913ca294d30c5b
3232
spec:
3333
hostNetwork: true
3434
dnsPolicy: ClusterFirstWithHostNet
@@ -145,7 +145,7 @@ spec:
145145
containerPort: 9411
146146
hostPort: 9411
147147
protocol: TCP
148-
image: quay.io/signalfx/splunk-otel-collector:0.36.0
148+
image: quay.io/signalfx/splunk-otel-collector:0.37.0
149149
imagePullPolicy: IfNotPresent
150150
env:
151151
- name: K8S_NODE_NAME

‎rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
helm.sh/chart: splunk-otel-collector-0.36.2
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/instance: default
12-
app.kubernetes.io/version: "0.36.0"
12+
app.kubernetes.io/version: "0.37.0"
1313
app: splunk-otel-collector
1414
component: otel-k8s-cluster-receiver
1515
chart: splunk-otel-collector-0.36.2
@@ -30,7 +30,7 @@ spec:
3030
component: otel-k8s-cluster-receiver
3131
release: default
3232
annotations:
33-
checksum/config: f5a6a679a375a94a44d7cfe43a799099e874ce6510cf7e250d5bc69709fa911a
33+
checksum/config: 7e2657de4432f54f2fffffd3bc51d863b6e6d76f400a1d02aea026edfcc98894
3434
spec:
3535
serviceAccountName: default-splunk-otel-collector
3636
nodeSelector:
@@ -41,7 +41,7 @@ spec:
4141
- /otelcol
4242
- --config=/conf/relay.yaml
4343
- --metrics-addr=0.0.0.0:8889
44-
image: quay.io/signalfx/splunk-otel-collector:0.36.0
44+
image: quay.io/signalfx/splunk-otel-collector:0.37.0
4545
imagePullPolicy: IfNotPresent
4646
env:
4747
- name: SPLUNK_MEMORY_TOTAL_MIB

‎rendered/manifests/agent-only/secret.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
helm.sh/chart: splunk-otel-collector-0.36.2
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/instance: default
12-
app.kubernetes.io/version: "0.36.0"
12+
app.kubernetes.io/version: "0.37.0"
1313
app: splunk-otel-collector
1414
chart: splunk-otel-collector-0.36.2
1515
release: default

‎rendered/manifests/agent-only/serviceAccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
helm.sh/chart: splunk-otel-collector-0.36.2
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/instance: default
12-
app.kubernetes.io/version: "0.36.0"
12+
app.kubernetes.io/version: "0.37.0"
1313
app: splunk-otel-collector
1414
chart: splunk-otel-collector-0.36.2
1515
release: default

‎rendered/manifests/gateway-only/clusterRole.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
helm.sh/chart: splunk-otel-collector-0.36.2
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/instance: default
12-
app.kubernetes.io/version: "0.36.0"
12+
app.kubernetes.io/version: "0.37.0"
1313
app: splunk-otel-collector
1414
chart: splunk-otel-collector-0.36.2
1515
release: default

‎rendered/manifests/gateway-only/clusterRoleBinding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
helm.sh/chart: splunk-otel-collector-0.36.2
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/instance: default
12-
app.kubernetes.io/version: "0.36.0"
12+
app.kubernetes.io/version: "0.37.0"
1313
app: splunk-otel-collector
1414
chart: splunk-otel-collector-0.36.2
1515
release: default

‎rendered/manifests/gateway-only/configmap-otel-collector.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
helm.sh/chart: splunk-otel-collector-0.36.2
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/instance: default
12-
app.kubernetes.io/version: "0.36.0"
12+
app.kubernetes.io/version: "0.37.0"
1313
app: splunk-otel-collector
1414
chart: splunk-otel-collector-0.36.2
1515
release: default
@@ -43,7 +43,7 @@ data:
4343
resource_attributes:
4444
- key: splunk.com/exclude
4545
value: "true"
46-
k8s_tagger:
46+
k8sattributes:
4747
extract:
4848
annotations:
4949
- from: pod
@@ -146,7 +146,7 @@ data:
146146
- splunk_hec/o11y
147147
processors:
148148
- memory_limiter
149-
- k8s_tagger
149+
- k8sattributes
150150
- batch
151151
- filter/logs
152152
- resource/logs
@@ -187,7 +187,7 @@ data:
187187
processors:
188188
- memory_limiter
189189
- batch
190-
- k8s_tagger
190+
- k8sattributes
191191
- resource/add_cluster_name
192192
receivers:
193193
- otlp

0 commit comments

Comments
 (0)