Skip to content

Commit 688736d

Browse files
ejsmithejsmith
committed
Use both prefixed and unprefixed otel variables
1 parent 197dc4c commit 688736d

File tree

3 files changed

+102
-0
lines changed

3 files changed

+102
-0
lines changed

‎k8s/exceptionless/templates/api.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,16 @@ spec:
7272
fieldPath: metadata.uid
7373
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
7474
value: "true"
75+
- name: OTEL_EXPORTER_OTLP_INSECURE
76+
value: "true"
7577
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
7678
value: http://$(HOST_IP):4317
79+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
80+
value: http://$(HOST_IP):4317
7781
- name: EX_OTEL_RESOURCE_ATTRIBUTES
7882
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
83+
- name: OTEL_RESOURCE_ATTRIBUTES
84+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
7985
- name: RunJobsInProcess
8086
value: 'false'
8187
- name: EnableWebSockets

‎k8s/exceptionless/templates/app.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,16 @@ spec:
7272
fieldPath: metadata.uid
7373
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
7474
value: "true"
75+
- name: OTEL_EXPORTER_OTLP_INSECURE
76+
value: "true"
7577
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
7678
value: http://$(HOST_IP):4317
79+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
80+
value: http://$(HOST_IP):4317
7781
- name: EX_OTEL_RESOURCE_ATTRIBUTES
7882
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
83+
- name: OTEL_RESOURCE_ATTRIBUTES
84+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
7985
- name: RunJobsInProcess
8086
value: 'false'
8187
{{- if (empty .Values.storage.connectionString) }}

‎k8s/exceptionless/templates/jobs.yaml

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,16 @@ spec:
6363
fieldPath: metadata.uid
6464
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
6565
value: "true"
66+
- name: OTEL_EXPORTER_OTLP_INSECURE
67+
value: "true"
6668
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
6769
value: http://$(HOST_IP):4317
70+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
71+
value: http://$(HOST_IP):4317
6872
- name: EX_OTEL_RESOURCE_ATTRIBUTES
6973
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
74+
- name: OTEL_RESOURCE_ATTRIBUTES
75+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
7076

7177
---
7278
apiVersion: apps/v1
@@ -134,10 +140,16 @@ spec:
134140
fieldPath: metadata.uid
135141
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
136142
value: "true"
143+
- name: OTEL_EXPORTER_OTLP_INSECURE
144+
value: "true"
137145
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
138146
value: http://$(HOST_IP):4317
147+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
148+
value: http://$(HOST_IP):4317
139149
- name: EX_OTEL_RESOURCE_ATTRIBUTES
140150
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
151+
- name: OTEL_RESOURCE_ATTRIBUTES
152+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
141153

142154
---
143155
apiVersion: batch/v1
@@ -195,10 +207,16 @@ spec:
195207
fieldPath: metadata.uid
196208
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
197209
value: "true"
210+
- name: OTEL_EXPORTER_OTLP_INSECURE
211+
value: "true"
198212
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
199213
value: http://$(HOST_IP):4317
214+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
215+
value: http://$(HOST_IP):4317
200216
- name: EX_OTEL_RESOURCE_ATTRIBUTES
201217
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
218+
- name: OTEL_RESOURCE_ATTRIBUTES
219+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
202220
restartPolicy: OnFailure
203221

204222
---
@@ -267,10 +285,16 @@ spec:
267285
fieldPath: metadata.uid
268286
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
269287
value: "true"
288+
- name: OTEL_EXPORTER_OTLP_INSECURE
289+
value: "true"
270290
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
271291
value: http://$(HOST_IP):4317
292+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
293+
value: http://$(HOST_IP):4317
272294
- name: EX_OTEL_RESOURCE_ATTRIBUTES
273295
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
296+
- name: OTEL_RESOURCE_ATTRIBUTES
297+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
274298

275299
---
276300
apiVersion: apps/v1
@@ -338,10 +362,16 @@ spec:
338362
fieldPath: metadata.uid
339363
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
340364
value: "true"
365+
- name: OTEL_EXPORTER_OTLP_INSECURE
366+
value: "true"
341367
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
342368
value: http://$(HOST_IP):4317
369+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
370+
value: http://$(HOST_IP):4317
343371
- name: EX_OTEL_RESOURCE_ATTRIBUTES
344372
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
373+
- name: OTEL_RESOURCE_ATTRIBUTES
374+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
345375

346376
{{- if not (kindIs "invalid" ( .Values.jobs.eventPosts | default dict ).maxReplicaCount) }}
347377
---
@@ -415,10 +445,16 @@ spec:
415445
fieldPath: metadata.uid
416446
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
417447
value: "true"
448+
- name: OTEL_EXPORTER_OTLP_INSECURE
449+
value: "true"
418450
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
419451
value: http://$(HOST_IP):4317
452+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
453+
value: http://$(HOST_IP):4317
420454
- name: EX_OTEL_RESOURCE_ATTRIBUTES
421455
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
456+
- name: OTEL_RESOURCE_ATTRIBUTES
457+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
422458
restartPolicy: OnFailure
423459

424460
---
@@ -487,10 +523,16 @@ spec:
487523
fieldPath: metadata.uid
488524
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
489525
value: "true"
526+
- name: OTEL_EXPORTER_OTLP_INSECURE
527+
value: "true"
490528
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
491529
value: http://$(HOST_IP):4317
530+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
531+
value: http://$(HOST_IP):4317
492532
- name: EX_OTEL_RESOURCE_ATTRIBUTES
493533
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
534+
- name: OTEL_RESOURCE_ATTRIBUTES
535+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
494536
---
495537
apiVersion: apps/v1
496538
kind: Deployment
@@ -557,10 +599,16 @@ spec:
557599
fieldPath: metadata.uid
558600
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
559601
value: "true"
602+
- name: OTEL_EXPORTER_OTLP_INSECURE
603+
value: "true"
560604
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
561605
value: http://$(HOST_IP):4317
606+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
607+
value: http://$(HOST_IP):4317
562608
- name: EX_OTEL_RESOURCE_ATTRIBUTES
563609
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
610+
- name: OTEL_RESOURCE_ATTRIBUTES
611+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
564612
---
565613
apiVersion: batch/v1
566614
kind: CronJob
@@ -617,10 +665,16 @@ spec:
617665
fieldPath: metadata.uid
618666
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
619667
value: "true"
668+
- name: OTEL_EXPORTER_OTLP_INSECURE
669+
value: "true"
620670
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
621671
value: http://$(HOST_IP):4317
672+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
673+
value: http://$(HOST_IP):4317
622674
- name: EX_OTEL_RESOURCE_ATTRIBUTES
623675
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
676+
- name: OTEL_RESOURCE_ATTRIBUTES
677+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
624678
restartPolicy: OnFailure
625679

626680
---
@@ -679,10 +733,16 @@ spec:
679733
fieldPath: metadata.uid
680734
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
681735
value: "true"
736+
- name: OTEL_EXPORTER_OTLP_INSECURE
737+
value: "true"
682738
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
683739
value: http://$(HOST_IP):4317
740+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
741+
value: http://$(HOST_IP):4317
684742
- name: EX_OTEL_RESOURCE_ATTRIBUTES
685743
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
744+
- name: OTEL_RESOURCE_ATTRIBUTES
745+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
686746
restartPolicy: OnFailure
687747

688748
---
@@ -741,10 +801,16 @@ spec:
741801
fieldPath: metadata.uid
742802
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
743803
value: "true"
804+
- name: OTEL_EXPORTER_OTLP_INSECURE
805+
value: "true"
744806
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
745807
value: http://$(HOST_IP):4317
808+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
809+
value: http://$(HOST_IP):4317
746810
- name: EX_OTEL_RESOURCE_ATTRIBUTES
747811
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
812+
- name: OTEL_RESOURCE_ATTRIBUTES
813+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
748814
restartPolicy: OnFailure
749815

750816
---
@@ -813,10 +879,16 @@ spec:
813879
fieldPath: metadata.uid
814880
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
815881
value: "true"
882+
- name: OTEL_EXPORTER_OTLP_INSECURE
883+
value: "true"
816884
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
817885
value: http://$(HOST_IP):4317
886+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
887+
value: http://$(HOST_IP):4317
818888
- name: EX_OTEL_RESOURCE_ATTRIBUTES
819889
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
890+
- name: OTEL_RESOURCE_ATTRIBUTES
891+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
820892
---
821893
apiVersion: apps/v1
822894
kind: Deployment
@@ -883,10 +955,16 @@ spec:
883955
fieldPath: metadata.uid
884956
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
885957
value: "true"
958+
- name: OTEL_EXPORTER_OTLP_INSECURE
959+
value: "true"
886960
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
887961
value: http://$(HOST_IP):4317
962+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
963+
value: http://$(HOST_IP):4317
888964
- name: EX_OTEL_RESOURCE_ATTRIBUTES
889965
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
966+
- name: OTEL_RESOURCE_ATTRIBUTES
967+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
890968
---
891969
apiVersion: apps/v1
892970
kind: Deployment
@@ -953,10 +1031,16 @@ spec:
9531031
fieldPath: metadata.uid
9541032
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
9551033
value: "true"
1034+
- name: OTEL_EXPORTER_OTLP_INSECURE
1035+
value: "true"
9561036
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
9571037
value: http://$(HOST_IP):4317
1038+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
1039+
value: http://$(HOST_IP):4317
9581040
- name: EX_OTEL_RESOURCE_ATTRIBUTES
9591041
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
1042+
- name: OTEL_RESOURCE_ATTRIBUTES
1043+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
9601044
{{- if (empty .Values.storage.connectionString) }}
9611045
volumeMounts:
9621046
- mountPath: "/app/storage"
@@ -1055,7 +1139,13 @@ spec:
10551139
fieldPath: metadata.uid
10561140
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
10571141
value: "true"
1142+
- name: OTEL_EXPORTER_OTLP_INSECURE
1143+
value: "true"
10581144
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
10591145
value: http://$(HOST_IP):4317
1146+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
1147+
value: http://$(HOST_IP):4317
10601148
- name: EX_OTEL_RESOURCE_ATTRIBUTES
10611149
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
1150+
- name: OTEL_RESOURCE_ATTRIBUTES
1151+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)

0 commit comments

Comments
 (0)