Merge pull request #3961 from zoomoid/main

QuentinBisson · web-flow · commit 13a6c6877bde · 2025-10-31T01:02:45.000+01:00
[tempo-distributed] make servicemonitor for jaeger (tempo-query) conditional
diff --git 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.4
+version: 1.52.5
 appVersion: 2.9.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.52.4](https://img.shields.io/badge/Version-1.52.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.0](https://img.shields.io/badge/AppVersion-2.9.0-informational?style=flat-square)
+![Version: 1.52.5](https://img.shields.io/badge/Version-1.52.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.0](https://img.shields.io/badge/AppVersion-2.9.0-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 
diff --git 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 }}

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+{{- if .Values.queryFrontend.query.enabled }}`
`1`	`2`	`{{- include "tempo.lib.serviceMonitor" (dict "ctx" $ "component" "tempo-query") }}`
	`3`	`+{{- end }}`