Skip to content

Commit 7580ed2

Browse files
NageshbansalNageshbansal
committed
chore(k8s-infra): bump the otel-collector version to 0.139.0
1 parent f6da9ba commit 7580ed2

14 files changed

+813
-860
lines changed

‎charts/k8s-infra/README.md‎

Lines changed: 763 additions & 763 deletions
Large diffs are not rendered by default.

‎charts/k8s-infra/templates/_config.tpl‎

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -217,21 +217,12 @@ exporters:
217217
{{- define "opentelemetry-collector.otlpExporterSelfTelemetryConfig" -}}
218218
exporters:
219219
otlphttp/self_telemetry:
220-
{{- if .Values.presets.selfTelemetry.endpoint }}
221-
endpoint: http{{ if not .Values.presets.selfTelemetry.insecure }}s{{ end }}://{{ .Values.presets.selfTelemetry.endpoint }}
220+
endpoint: {{ if .Values.presets.selfTelemetry.endpoint -}}{{ .Values.presets.selfTelemetry.endpoint }}{{- else -}}${env:OTEL_EXPORTER_OTLP_ENDPOINT}{{- end }}
222221
tls:
223-
insecure: {{ .Values.presets.selfTelemetry.insecure }}
224-
insecure_skip_verify: {{ .Values.presets.selfTelemetry.insecureSkipVerify }}
222+
insecure: {{ if .Values.presets.selfTelemetry.endpoint }}{{ .Values.presets.selfTelemetry.insecure }}{{ else }}{{ .Values.otelInsecure }}{{ end }}
223+
insecure_skip_verify: {{ if .Values.presets.selfTelemetry.endpoint }}{{ .Values.presets.selfTelemetry.insecureSkipVerify }}{{ else }}{{ .Values.insecureSkipVerify }}{{ end }}
225224
headers:
226-
"signoz-access-token": "${env:SIGNOZ_SELF_TELEMETRY_API_KEY}"
227-
{{- else }}
228-
endpoint: http{{ if not .Values.otelInsecure }}s{{ end }}://${env:OTEL_EXPORTER_OTLP_ENDPOINT}
229-
tls:
230-
insecure: ${env:OTEL_EXPORTER_OTLP_INSECURE}
231-
insecure_skip_verify: ${env:OTEL_EXPORTER_OTLP_INSECURE_SKIP_VERIFY}
232-
headers:
233-
"signoz-access-token": ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
234-
{{- end }}
225+
"signoz-ingestion-key": "${env:SIGNOZ_SELF_TELEMETRY_API_KEY}"
235226
{{- end }}
236227

237228
{{/*
@@ -247,11 +238,11 @@ service:
247238
exporter:
248239
otlp:
249240
protocol: http/protobuf
250-
endpoint: {{ if .Values.presets.selfTelemetry.endpoint }}http{{ if not .Values.presets.selfTelemetry.insecure }}s{{ end }}://{{ .Values.presets.selfTelemetry.endpoint }}{{ else }}http{{ if not .Values.otelInsecure }}s{{ end }}://${env:OTEL_EXPORTER_OTLP_ENDPOINT}{{ end }}
251-
insecure: {{ if .Values.presets.selfTelemetry.endpoint }}{{ .Values.presets.selfTelemetry.insecure }}{{ else }}${env:OTEL_EXPORTER_OTLP_INSECURE}{{ end }}
241+
endpoint: {{ if .Values.presets.selfTelemetry.endpoint -}}{{ .Values.presets.selfTelemetry.endpoint }}{{- else -}}${env:OTEL_EXPORTER_OTLP_ENDPOINT}{{ end }}
242+
insecure: {{ if .Values.presets.selfTelemetry.endpoint -}}{{ .Values.presets.selfTelemetry.insecure }}{{- else -}}{{ .Values.otelInsecure }}{{ end }}
252243
compression: gzip
253244
headers:
254-
"signoz-access-token": "${env:SIGNOZ_SELF_TELEMETRY_API_KEY}"
245+
"signoz-ingestion-key": "${env:SIGNOZ_SELF_TELEMETRY_API_KEY}"
255246
propagators:
256247
- tracecontext
257248
- b3
@@ -271,15 +262,11 @@ service:
271262
exporter:
272263
otlp:
273264
protocol: http/protobuf
274-
endpoint: {{ if .Values.presets.selfTelemetry.endpoint -}}
275-
http{{ if not .Values.presets.selfTelemetry.insecure }}s{{ end }}://{{ .Values.presets.selfTelemetry.endpoint }}
276-
{{- else -}}
277-
http{{ if not .Values.otelInsecure }}s{{ end }}://${env:OTEL_EXPORTER_OTLP_ENDPOINT}
278-
{{- end }}
279-
insecure: {{ if .Values.presets.selfTelemetry.endpoint }}{{ .Values.presets.selfTelemetry.insecure }}{{ else }}${env:OTEL_EXPORTER_OTLP_INSECURE}{{ end }}
265+
endpoint: {{ if .Values.presets.selfTelemetry.endpoint -}}{{ .Values.presets.selfTelemetry.endpoint }}{{- else -}}${env:OTEL_EXPORTER_OTLP_ENDPOINT}{{ end }}
266+
insecure: {{ if .Values.presets.selfTelemetry.endpoint -}}{{ .Values.presets.selfTelemetry.insecure }}{{- else -}}{{ .Values.otelInsecure }}{{ end }}
280267
compression: gzip
281268
headers:
282-
"signoz-access-token": "${env:SIGNOZ_SELF_TELEMETRY_API_KEY}"
269+
"signoz-ingestion-key": "${env:SIGNOZ_SELF_TELEMETRY_API_KEY}"
283270
{{- end }}
284271

285272
{{/*

‎charts/k8s-infra/tests/otel-agent_autogke_kubelet_test.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,5 +110,3 @@ tests:
110110
telemetry:
111111
logs:
112112
encoding: json
113-
metrics:
114-
address: 0.0.0.0:8888

‎charts/k8s-infra/tests/otel-agent_debug_exporter_test.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ tests:
9696
telemetry:
9797
logs:
9898
encoding: json
99-
metrics:
100-
address: 0.0.0.0:8888
10199
102100
# Test case 2: Verify debug exporter is enabled when set to true with custom settings
103101
- it: should have debug enabled is enabled with custom settings
@@ -166,8 +164,6 @@ tests:
166164
telemetry:
167165
logs:
168166
encoding: json
169-
metrics:
170-
address: 0.0.0.0:8888
171167
172168
# Test case 3: Verify debug exporter is enabled when set to true with custom settings
173169
- it: should have logging exporter enabled is enabled with custom settings
@@ -236,5 +232,3 @@ tests:
236232
telemetry:
237233
logs:
238234
encoding: json
239-
metrics:
240-
address: 0.0.0.0:8888

‎charts/k8s-infra/tests/otel-agent_host_metrics_test.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,6 @@ tests:
136136
telemetry:
137137
logs:
138138
encoding: json
139-
metrics:
140-
address: 0.0.0.0:8888
141139
template: otel-agent/configmap.yaml
142140
- contains:
143141
path: spec.template.spec.volumes
@@ -269,8 +267,6 @@ tests:
269267
telemetry:
270268
logs:
271269
encoding: json
272-
metrics:
273-
address: 0.0.0.0:8888
274270
template: otel-agent/configmap.yaml
275271
- contains:
276272
path: spec.template.spec.volumes
@@ -400,8 +396,6 @@ tests:
400396
telemetry:
401397
logs:
402398
encoding: json
403-
metrics:
404-
address: 0.0.0.0:8888
405399
template: otel-agent/configmap.yaml
406400
- notContains:
407401
path: spec.template.spec.volumes
@@ -533,8 +527,6 @@ tests:
533527
telemetry:
534528
logs:
535529
encoding: json
536-
metrics:
537-
address: 0.0.0.0:8888
538530
template: otel-agent/configmap.yaml
539531
- contains:
540532
path: spec.template.spec.volumes

‎charts/k8s-infra/tests/otel-agent_log_collection_test.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,3 @@ tests:
7878
telemetry:
7979
logs:
8080
encoding: json
81-
metrics:
82-
address: 0.0.0.0:8888

‎charts/k8s-infra/tests/otel-agent_logs_collection_mulitline_test.yaml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ tests:
4242
value: |-
4343
exporters:
4444
otlphttp/self_telemetry:
45-
endpoint: http://test-endpoint:4317
45+
endpoint: test-endpoint:4317
4646
headers:
47-
signoz-access-token: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
47+
signoz-ingestion-key: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
4848
tls:
4949
insecure: true
5050
insecure_skip_verify: true
@@ -111,8 +111,6 @@ tests:
111111
telemetry:
112112
logs:
113113
encoding: json
114-
metrics:
115-
address: 0.0.0.0:8888
116114
117115
- it: multiline (line_start_pattern) is rendered correctly
118116
set:
@@ -126,9 +124,9 @@ tests:
126124
value: |-
127125
exporters:
128126
otlphttp/self_telemetry:
129-
endpoint: http://test-endpoint:4317
127+
endpoint: test-endpoint:4317
130128
headers:
131-
signoz-access-token: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
129+
signoz-ingestion-key: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
132130
tls:
133131
insecure: true
134132
insecure_skip_verify: true
@@ -199,8 +197,6 @@ tests:
199197
telemetry:
200198
logs:
201199
encoding: json
202-
metrics:
203-
address: 0.0.0.0:8888
204200
- it: multiline (line_end_pattern) is rendered correctly
205201
set:
206202
presets:
@@ -213,9 +209,9 @@ tests:
213209
value: |-
214210
exporters:
215211
otlphttp/self_telemetry:
216-
endpoint: http://test-endpoint:4317
212+
endpoint: test-endpoint:4317
217213
headers:
218-
signoz-access-token: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
214+
signoz-ingestion-key: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
219215
tls:
220216
insecure: true
221217
insecure_skip_verify: true
@@ -286,5 +282,3 @@ tests:
286282
telemetry:
287283
logs:
288284
encoding: json
289-
metrics:
290-
address: 0.0.0.0:8888

‎charts/k8s-infra/tests/otel-agent_otlp_exporter_test.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ tests:
9595
telemetry:
9696
logs:
9797
encoding: json
98-
metrics:
99-
address: 0.0.0.0:8888
10098
10199
# Test case 2: Verify otlp/http is enabled when the value is set to true
102100
- it: should enable otlp/http when otlphttpExporter set to true
@@ -165,5 +163,3 @@ tests:
165163
telemetry:
166164
logs:
167165
encoding: json
168-
metrics:
169-
address: 0.0.0.0:8888

‎charts/k8s-infra/tests/otel-agent_self_telemetry_enable_otlp_test.yaml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ tests:
5555
insecure: ${env:OTEL_EXPORTER_OTLP_INSECURE}
5656
insecure_skip_verify: ${env:OTEL_EXPORTER_OTLP_INSECURE_SKIP_VERIFY}
5757
otlphttp/self_telemetry:
58-
endpoint: http://selftelemetryhost:443
58+
endpoint: selftelemetryhost:443
5959
headers:
60-
signoz-access-token: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
60+
signoz-ingestion-key: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
6161
tls:
6262
insecure: true
6363
insecure_skip_verify: true
@@ -131,16 +131,15 @@ tests:
131131
logs:
132132
encoding: json
133133
metrics:
134-
address: 0.0.0.0:8888
135134
level: detailed
136135
readers:
137136
- periodic:
138137
exporter:
139138
otlp:
140139
compression: gzip
141-
endpoint: http://selftelemetryhost:443
140+
endpoint: selftelemetryhost:443
142141
headers:
143-
signoz-access-token: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
142+
signoz-ingestion-key: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
144143
insecure: true
145144
protocol: http/protobuf
146145
resource:
@@ -155,11 +154,11 @@ tests:
155154
exporter:
156155
otlp:
157156
compression: gzip
158-
endpoint: http://selftelemetryhost:443
157+
endpoint: selftelemetryhost:443
159158
headers:
160-
signoz-access-token: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
159+
signoz-ingestion-key: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
161160
insecure: true
162161
protocol: http/protobuf
163162
propagators:
164163
- tracecontext
165-
- b3
164+
- b3

‎charts/k8s-infra/tests/otel-agent_self_telemetry_test.yaml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ tests:
4646
value: |-
4747
exporters:
4848
otlphttp/self_telemetry:
49-
endpoint: http://myhost:443
49+
endpoint: myhost:443
5050
headers:
51-
signoz-access-token: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
51+
signoz-ingestion-key: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
5252
tls:
5353
insecure: true
5454
insecure_skip_verify: true
@@ -101,16 +101,15 @@ tests:
101101
logs:
102102
encoding: json
103103
metrics:
104-
address: 0.0.0.0:8888
105104
level: detailed
106105
readers:
107106
- periodic:
108107
exporter:
109108
otlp:
110109
compression: gzip
111-
endpoint: http://myhost:443
110+
endpoint: myhost:443
112111
headers:
113-
signoz-access-token: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
112+
signoz-ingestion-key: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
114113
insecure: true
115114
protocol: http/protobuf
116115
resource:
@@ -125,9 +124,9 @@ tests:
125124
exporter:
126125
otlp:
127126
compression: gzip
128-
endpoint: http://myhost:443
127+
endpoint: myhost:443
129128
headers:
130-
signoz-access-token: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
129+
signoz-ingestion-key: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
131130
insecure: true
132131
protocol: http/protobuf
133132
propagators:

0 commit comments

Comments
 (0)