From 9d4f1eaec5a8fd2badeb8be3507510425d3da320 Mon Sep 17 00:00:00 2001 From: knlnks Date: Fri, 19 Apr 2024 21:30:07 -0700 Subject: [PATCH 1/7] Add port --- charts/retool/templates/deployment_telemetry.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/charts/retool/templates/deployment_telemetry.yaml b/charts/retool/templates/deployment_telemetry.yaml index 9ab42c2..4cdf20c 100644 --- a/charts/retool/templates/deployment_telemetry.yaml +++ b/charts/retool/templates/deployment_telemetry.yaml @@ -129,6 +129,9 @@ spec: - containerPort: 9125 name: udp-statsd protocol: UDP + - containerPort: 4317 + name: otel-traces + protocol: TCP {{- if .Values.telemetry.extraPorts }} {{- .Values.telemetry.extraPorts | toYaml | nindent 10 }} {{- end }} @@ -178,6 +181,9 @@ spec: - name: udp-statsd port: 9125 protocol: UDP + - name: otel-traces + port: 4317 + protocol: TCP selector: {{- include "retool.telemetry.selectorLabels" . | nindent 4 }} type: ClusterIP From 79584e8ea4b1179252e66270ea9c9b148b232b3d Mon Sep 17 00:00:00 2001 From: knlnks Date: Fri, 19 Apr 2024 21:30:13 -0700 Subject: [PATCH 2/7] Add env vars --- charts/retool/templates/_telemetry_helpers.tpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/retool/templates/_telemetry_helpers.tpl b/charts/retool/templates/_telemetry_helpers.tpl index d69130c..e8008be 100644 --- a/charts/retool/templates/_telemetry_helpers.tpl +++ b/charts/retool/templates/_telemetry_helpers.tpl @@ -68,5 +68,9 @@ Env vars to include on retool pods to collect telemetry via telemetry pod. value: {{ printf "%s.%s" (include "retool.telemetry.fullname" .) .Release.Namespace | quote }} - name: STATSD_PORT value: "9125" +- name: OTEL_HOST + value: {{ printf "%s.%s" (include "retool.telemetry.fullname" .) .Release.Namespace | quote }} +- name: OTEL_PORT + value: "4317" {{- end }} {{- end }} From 02f0c2359bb7e4687bc33da60b0d251635801bc6 Mon Sep 17 00:00:00 2001 From: knlnks Date: Fri, 19 Apr 2024 21:51:05 -0700 Subject: [PATCH 3/7] Remove unneeded line --- charts/retool/templates/deployment_telemetry.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/retool/templates/deployment_telemetry.yaml b/charts/retool/templates/deployment_telemetry.yaml index 4cdf20c..6558fd7 100644 --- a/charts/retool/templates/deployment_telemetry.yaml +++ b/charts/retool/templates/deployment_telemetry.yaml @@ -131,7 +131,6 @@ spec: protocol: UDP - containerPort: 4317 name: otel-traces - protocol: TCP {{- if .Values.telemetry.extraPorts }} {{- .Values.telemetry.extraPorts | toYaml | nindent 10 }} {{- end }} @@ -183,7 +182,6 @@ spec: protocol: UDP - name: otel-traces port: 4317 - protocol: TCP selector: {{- include "retool.telemetry.selectorLabels" . | nindent 4 }} type: ClusterIP From 7cc1ce2f79d5db1120db73593af8b6f3b6243bda Mon Sep 17 00:00:00 2001 From: knlnks Date: Tue, 20 Aug 2024 14:42:15 -0700 Subject: [PATCH 4/7] Rename env vars --- charts/retool/templates/_telemetry_helpers.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/retool/templates/_telemetry_helpers.tpl b/charts/retool/templates/_telemetry_helpers.tpl index e8008be..bcd4374 100644 --- a/charts/retool/templates/_telemetry_helpers.tpl +++ b/charts/retool/templates/_telemetry_helpers.tpl @@ -68,9 +68,9 @@ Env vars to include on retool pods to collect telemetry via telemetry pod. value: {{ printf "%s.%s" (include "retool.telemetry.fullname" .) .Release.Namespace | quote }} - name: STATSD_PORT value: "9125" -- name: OTEL_HOST +- name: OTLP_HOST value: {{ printf "%s.%s" (include "retool.telemetry.fullname" .) .Release.Namespace | quote }} -- name: OTEL_PORT +- name: OTLP_PORT value: "4317" {{- end }} {{- end }} From ac828d5677b27c666262146a4a595d7bc3eaa4a4 Mon Sep 17 00:00:00 2001 From: knlnks Date: Mon, 26 Aug 2024 11:46:20 -0700 Subject: [PATCH 5/7] Update port --- charts/retool/templates/_telemetry_helpers.tpl | 2 +- charts/retool/templates/deployment_telemetry.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/retool/templates/_telemetry_helpers.tpl b/charts/retool/templates/_telemetry_helpers.tpl index bcd4374..8756826 100644 --- a/charts/retool/templates/_telemetry_helpers.tpl +++ b/charts/retool/templates/_telemetry_helpers.tpl @@ -71,6 +71,6 @@ Env vars to include on retool pods to collect telemetry via telemetry pod. - name: OTLP_HOST value: {{ printf "%s.%s" (include "retool.telemetry.fullname" .) .Release.Namespace | quote }} - name: OTLP_PORT - value: "4317" + value: "4318" {{- end }} {{- end }} diff --git a/charts/retool/templates/deployment_telemetry.yaml b/charts/retool/templates/deployment_telemetry.yaml index 6558fd7..e044994 100644 --- a/charts/retool/templates/deployment_telemetry.yaml +++ b/charts/retool/templates/deployment_telemetry.yaml @@ -129,7 +129,7 @@ spec: - containerPort: 9125 name: udp-statsd protocol: UDP - - containerPort: 4317 + - containerPort: 4318 name: otel-traces {{- if .Values.telemetry.extraPorts }} {{- .Values.telemetry.extraPorts | toYaml | nindent 10 }} @@ -181,7 +181,7 @@ spec: port: 9125 protocol: UDP - name: otel-traces - port: 4317 + port: 4318 selector: {{- include "retool.telemetry.selectorLabels" . | nindent 4 }} type: ClusterIP From a9c7f2b8820daf3845533134d8dbbf246275f544 Mon Sep 17 00:00:00 2001 From: knlnks Date: Mon, 26 Aug 2024 11:46:47 -0700 Subject: [PATCH 6/7] Rename env var --- charts/retool/templates/_telemetry_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/retool/templates/_telemetry_helpers.tpl b/charts/retool/templates/_telemetry_helpers.tpl index 8756826..8df15a5 100644 --- a/charts/retool/templates/_telemetry_helpers.tpl +++ b/charts/retool/templates/_telemetry_helpers.tpl @@ -70,7 +70,7 @@ Env vars to include on retool pods to collect telemetry via telemetry pod. value: "9125" - name: OTLP_HOST value: {{ printf "%s.%s" (include "retool.telemetry.fullname" .) .Release.Namespace | quote }} -- name: OTLP_PORT +- name: OTLP_HTTP_PORT value: "4318" {{- end }} {{- end }} From 7f3391ad7e83bf0cc9940ac49597dff2ea5f8634 Mon Sep 17 00:00:00 2001 From: knlnks Date: Tue, 10 Sep 2024 14:07:12 -0700 Subject: [PATCH 7/7] bump --- charts/retool/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/retool/Chart.yaml b/charts/retool/Chart.yaml index 1c518c5..2f86220 100644 --- a/charts/retool/Chart.yaml +++ b/charts/retool/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: retool description: A Helm chart for Kubernetes type: application -version: 6.2.8 +version: 6.2.9 maintainers: - name: Retool Engineering email: engineering+helm@retool.com