Skip to content

Commit

Permalink
Use both prefixed and unprefixed otel variables
Browse files Browse the repository at this point in the history
  • Loading branch information
@ejsmith
ejsmith committed Oct 16, 2024
1 parent 197dc4c commit 688736d
Show file tree
Hide file tree
Showing 3 changed files with 102 additions and 0 deletions.
6 changes: 6 additions & 0 deletions k8s/exceptionless/templates/api.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,16 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: RunJobsInProcess
value: 'false'
- name: EnableWebSockets
Expand Down
6 changes: 6 additions & 0 deletions k8s/exceptionless/templates/app.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,16 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: RunJobsInProcess
value: 'false'
{{- if (empty .Values.storage.connectionString) }}
Expand Down
90 changes: 90 additions & 0 deletions k8s/exceptionless/templates/jobs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,16 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)

---
apiVersion: apps/v1
Expand Down Expand Up @@ -134,10 +140,16 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)

---
apiVersion: batch/v1
Expand Down Expand Up @@ -195,10 +207,16 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
restartPolicy: OnFailure

---
Expand Down Expand Up @@ -267,10 +285,16 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)

---
apiVersion: apps/v1
Expand Down Expand Up @@ -338,10 +362,16 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)

{{- if not (kindIs "invalid" ( .Values.jobs.eventPosts | default dict ).maxReplicaCount) }}
---
Expand Down Expand Up @@ -415,10 +445,16 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
restartPolicy: OnFailure

---
Expand Down Expand Up @@ -487,10 +523,16 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
---
apiVersion: apps/v1
kind: Deployment
Expand Down Expand Up @@ -557,10 +599,16 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
---
apiVersion: batch/v1
kind: CronJob
Expand Down Expand Up @@ -617,10 +665,16 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
restartPolicy: OnFailure

---
Expand Down Expand Up @@ -679,10 +733,16 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
restartPolicy: OnFailure

---
Expand Down Expand Up @@ -741,10 +801,16 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
restartPolicy: OnFailure

---
Expand Down Expand Up @@ -813,10 +879,16 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
---
apiVersion: apps/v1
kind: Deployment
Expand Down Expand Up @@ -883,10 +955,16 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
---
apiVersion: apps/v1
kind: Deployment
Expand Down Expand Up @@ -953,10 +1031,16 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
{{- if (empty .Values.storage.connectionString) }}
volumeMounts:
- mountPath: "/app/storage"
Expand Down Expand Up @@ -1055,7 +1139,13 @@ spec:
fieldPath: metadata.uid
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "true"
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://$(HOST_IP):4317
- name: EX_OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
- name: OTEL_RESOURCE_ATTRIBUTES
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)

0 comments on commit 688736d

Please sign in to comment.