From e1d3d0cf43f57cf6fdeef8116b76fa2496181cc4 Mon Sep 17 00:00:00 2001 From: Alexander Bartolomey Date: Wed, 29 Oct 2025 12:36:13 +0100 Subject: [PATCH 1/4] refactor(tempo-distributed): include servicemonitor for (jaeger) tempo-query only if enabled Currently the service monitor is added regardless of whether the old jaeger mode is enabled or not. Similar to the ports on the deployment and service, we only include the servicemonitor if `queryFrontend.query.enabled=true`. Additionally, the selector of the service monitor does not work anyway, because the service that includes the old ports has a different `app.kubernetes.io/component` label than the one created from the servicemonitor template Signed-off-by: Alexander Bartolomey --- .../templates/query-frontend/servicemonitor-jaeger-query.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/tempo-distributed/templates/query-frontend/servicemonitor-jaeger-query.yaml b/charts/tempo-distributed/templates/query-frontend/servicemonitor-jaeger-query.yaml index 5d8fa1a59a..c0bd7f4321 100644 --- a/charts/tempo-distributed/templates/query-frontend/servicemonitor-jaeger-query.yaml +++ b/charts/tempo-distributed/templates/query-frontend/servicemonitor-jaeger-query.yaml @@ -1 +1,3 @@ +{{- if .Values.queryFrontend.query.enabled }} {{- include "tempo.lib.serviceMonitor" (dict "ctx" $ "component" "tempo-query") }} +{{- end }} From 0e8b73cb26e9ff62e9356d552155e2ba3dbbd04a Mon Sep 17 00:00:00 2001 From: Alexander Bartolomey Date: Wed, 29 Oct 2025 15:20:59 +0100 Subject: [PATCH 2/4] refactor: tempo-query templates don't work anything like they used to 1. remove servicemonitor. tempo-query is now only a gRPC proxy for jaeger. There's not metrics, and no UI anymore 2. remove jaeger metrics and ui ports from service. They plainly dont exist anymore. the ports are also not what the server expects, there's a single server running on default 7777 3. use correct config file for tempo-query, the executable loads the wrong config file Signed-off-by: Alexander Bartolomey --- .../query-frontend/deployment-query-frontend.yaml | 8 +++----- .../service-query-frontend-discovery.yaml | 11 +++++------ .../query-frontend/service-query-frontend.yaml | 11 +++++------ .../query-frontend/servicemonitor-jaeger-query.yaml | 3 --- 4 files changed, 13 insertions(+), 20 deletions(-) delete mode 100644 charts/tempo-distributed/templates/query-frontend/servicemonitor-jaeger-query.yaml diff --git a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml index 3609e61023..cfd8f6f433 100644 --- a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml @@ -118,7 +118,7 @@ spec: {{- end }} {{- if .Values.queryFrontend.query.enabled }} - args: - - -config=/conf/tempo.yaml + - -config=/conf/tempo-query.yaml {{- with .Values.queryFrontend.query.extraArgs }} {{- toYaml . | nindent 12 }} {{- end }} @@ -129,10 +129,8 @@ spec: imagePullPolicy: {{ .Values.tempo.image.pullPolicy }} name: tempo-query ports: - - containerPort: {{ .Values.queryFrontend.service.port }} - name: jaeger-ui - - containerPort: 16687 - name: jaeger-metrics + - containerPort: 7777 + name: tempo-query {{- with .Values.queryFrontend.query.extraEnv }} env: {{- toYaml . | nindent 12 }} diff --git a/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml b/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml index f776695e74..1d0772f109 100644 --- a/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml +++ b/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml @@ -34,12 +34,11 @@ spec: appProtocol: {{ .Values.queryFrontend.appProtocol.grpc }} {{- end }} {{- if .Values.queryFrontend.query.enabled }} - - name: tempo-query-jaeger-ui - port: {{ .Values.queryFrontend.service.port }} - targetPort: {{ .Values.queryFrontend.service.port }} - - name: tempo-query-metrics - port: 16687 - targetPort: jaeger-metrics + - name: tempo-query + port: 7777 + targetPort: tempo-query + protocol: TCP + appProtocol: grpc {{- end }} publishNotReadyAddresses: true selector: diff --git a/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml index f2831e9b48..bb1f7179d9 100644 --- a/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml @@ -28,12 +28,11 @@ spec: appProtocol: {{ .Values.queryFrontend.appProtocol.grpc }} {{- end }} {{- if .Values.queryFrontend.query.enabled }} - - name: tempo-query-jaeger-ui - port: {{ .Values.queryFrontend.service.port }} - targetPort: {{ .Values.queryFrontend.service.port }} - - name: tempo-query-metrics - port: 16687 - targetPort: jaeger-metrics + - name: tempo-query + port: 7777 + targetPort: tempo-query + protocol: TCP + appProtocol: grpc {{- end }} {{- if .Values.queryFrontend.service.loadBalancerIP }} loadBalancerIP: {{ .Values.queryFrontend.service.loadBalancerIP }} diff --git a/charts/tempo-distributed/templates/query-frontend/servicemonitor-jaeger-query.yaml b/charts/tempo-distributed/templates/query-frontend/servicemonitor-jaeger-query.yaml deleted file mode 100644 index c0bd7f4321..0000000000 --- a/charts/tempo-distributed/templates/query-frontend/servicemonitor-jaeger-query.yaml +++ /dev/null @@ -1,3 +0,0 @@ -{{- if .Values.queryFrontend.query.enabled }} -{{- include "tempo.lib.serviceMonitor" (dict "ctx" $ "component" "tempo-query") }} -{{- end }} From eb23f9ac04c4715841236301796c04143240b512 Mon Sep 17 00:00:00 2001 From: Alexander Bartolomey Date: Wed, 29 Oct 2025 15:46:54 +0100 Subject: [PATCH 3/4] refactor: change port of query-frontend service and ingress The port was still pointing to a jaeger-related HTTP port, this is gone since https://github.com/grafana/tempo/pull/3840 so don't use it anymore HTTP ingress is no longer for connecting to jaeger UI, but can instead be used for e.g. grafana data sources access via ingress Signed-off-by: Alexander Bartolomey --- .../templates/query-frontend/ingress-query-frontend.yaml | 2 +- charts/tempo-distributed/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/templates/query-frontend/ingress-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/ingress-query-frontend.yaml index 8701471d40..92d7758bd5 100644 --- a/charts/tempo-distributed/templates/query-frontend/ingress-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/ingress-query-frontend.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.queryFrontend.query.enabled .Values.queryFrontend.ingress.enabled -}} +{{- if .Values.queryFrontend.ingress.enabled -}} {{ $dict := dict "ctx" . "component" "query-frontend" }} {{- $ingressApiIsStable := eq (include "tempo.ingress.isStable" .) "true" -}} {{- $ingressSupportsIngressClassName := eq (include "tempo.ingress.supportsIngressClassName" .) "true" -}} diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 6261616d1e..1f7779e284 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1006,7 +1006,7 @@ queryFrontend: tag: null service: # -- Port of the query-frontend service - port: 16686 + port: 3200 # -- Annotations for queryFrontend service annotations: {} # -- Labels for queryFrontend service From 9a08b9f46fd4c6ad6708ea67f0d65680dd8b2e64 Mon Sep 17 00:00:00 2001 From: Alexander Bartolomey Date: Fri, 31 Oct 2025 00:20:46 +0100 Subject: [PATCH 4/4] chore: bump chart version Signed-off-by: Alexander Bartolomey --- charts/tempo-distributed/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 5eb09fc651..97a8c3962e 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.52.3 +version: 1.53.0 appVersion: 2.9.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/