Skip to content

Commit 42b21a1

Browse files
committed
Use host node otel endpoint
1 parent 83aa53a commit 42b21a1

File tree

6 files changed

+340
-136
lines changed

6 files changed

+340
-136
lines changed

k8s/ex-prod-values.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,5 @@ config:
3737
EX_TestEmailAddress: "test@exceptionless.io"
3838
EX_EnableArchive: "false"
3939
EX_Serilog__MinimumLevel__Default: "Warning"
40-
EX_OTEL_EXPORTER_OTLP_ENDPOINT: http://apm.elastic-system.svc:8200
4140
EX_Apm__EnableLogs: "true"
4241
EX_Apm__FullDetails: "true"

k8s/ex-setup.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ Write-Output "AZ_USERNAME=$AZ_USERNAME AZ_PASSWORD=$AZ_PASSWORD AZ_TENANT=$AZ_TE
181181

182182
# renew service principal
183183
$SP_ID=$(az aks show --resource-group $RESOURCE_GROUP --name $CLUSTER --query servicePrincipalProfile.clientId -o tsv)
184-
$SP_SECRET=$(az ad sp credential reset --name $SP_ID --years 3 --query password -o tsv)
184+
$SP_SECRET=$(az ad sp credential reset --id $SP_ID --years 3 --query password -o tsv)
185185
# store secret in 1Password (Exceptionless Azure CI Service Principal)
186186
az aks update-credentials --resource-group $RESOURCE_GROUP --name $CLUSTER --reset-service-principal --service-principal $SP_ID --client-secret $SP_SECRET
187187
az aks get-credentials --resource-group $RESOURCE_GROUP --name $CLUSTER --overwrite-existing

k8s/exceptionless/templates/api.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,25 @@ spec:
5757
- configMapRef:
5858
name: {{ template "exceptionless.fullname" . }}-config
5959
env:
60+
- name: HOST_IP
61+
valueFrom:
62+
fieldRef:
63+
fieldPath: status.hostIP
64+
- name: K8S_POD_IP
65+
valueFrom:
66+
fieldRef:
67+
apiVersion: v1
68+
fieldPath: status.podIP
69+
- name: K8S_POD_UID
70+
valueFrom:
71+
fieldRef:
72+
fieldPath: metadata.uid
73+
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
74+
value: "true"
75+
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
76+
value: $(HOST_IP):4317
77+
- name: EX_OTEL_RESOURCE_ATTRIBUTES
78+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
6079
- name: RunJobsInProcess
6180
value: 'false'
6281
- name: EnableWebSockets

k8s/exceptionless/templates/app.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,25 @@ spec:
5757
- configMapRef:
5858
name: {{ template "exceptionless.fullname" . }}-config
5959
env:
60+
- name: HOST_IP
61+
valueFrom:
62+
fieldRef:
63+
fieldPath: status.hostIP
64+
- name: K8S_POD_IP
65+
valueFrom:
66+
fieldRef:
67+
apiVersion: v1
68+
fieldPath: status.podIP
69+
- name: K8S_POD_UID
70+
valueFrom:
71+
fieldRef:
72+
fieldPath: metadata.uid
73+
- name: EX_OTEL_EXPORTER_OTLP_INSECURE
74+
value: "true"
75+
- name: EX_OTEL_EXPORTER_OTLP_ENDPOINT
76+
value: $(HOST_IP):4317
77+
- name: EX_OTEL_RESOURCE_ATTRIBUTES
78+
value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)
6079
- name: RunJobsInProcess
6180
value: 'false'
6281
{{- if (empty .Values.storage.connectionString) }}

0 commit comments

Comments
 (0)