From 38dcbf3b75739715ba43eaef499e27ab4797af80 Mon Sep 17 00:00:00 2001 From: gsmith-sas <65406958+gsmith-sas@users.noreply.github.com> Date: Mon, 1 Dec 2025 15:22:49 -0500 Subject: [PATCH 1/6] Bump Tempo version to 2.9.0 and Tempo Helm chart to 1.24.1 --- component_versions.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/component_versions.env b/component_versions.env index b2cfb5c6..fd15b660 100644 --- a/component_versions.env +++ b/component_versions.env @@ -71,5 +71,5 @@ PUSHGATEWAY_FULL_IMAGE="quay.io/prometheus/pushgateway:v1.11.1" #Tempo TEMPO_CHART_REPO=grafana TEMPO_CHART_NAME=tempo -TEMPO_CHART_VERSION=1.18.1 -TEMPO_FULL_IMAGE="docker.io/grafana/tempo:2.7.0" +TEMPO_CHART_VERSION=1.24.1 +TEMPO_FULL_IMAGE="docker.io/grafana/tempo:2.9.0" From 51075654a5add8ea4babc68689432dc6b4c22d36 Mon Sep 17 00:00:00 2001 From: gsmith-sas <65406958+gsmith-sas@users.noreply.github.com> Date: Mon, 1 Dec 2025 15:23:25 -0500 Subject: [PATCH 2/6] Update tempo_container_image.template to match image spec with Helm chart --- monitoring/tempo_container_image.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/tempo_container_image.template b/monitoring/tempo_container_image.template index 8b64a5af..e2106e95 100644 --- a/monitoring/tempo_container_image.template +++ b/monitoring/tempo_container_image.template @@ -1,5 +1,5 @@ tempo: - repository: __IMAGE_REPO_3LEVEL__ + repository: __IMAGE_REPO_2LEVEL__ tag: __IMAGE_TAG__ pullPolicy: __IMAGE_PULL_POLICY__ pullSecrets: __IMAGE_PULL_SECRETS__ From 05a0f40c44538d26da391922a4c6e396bb08c268 Mon Sep 17 00:00:00 2001 From: gsmith-sas <65406958+gsmith-sas@users.noreply.github.com> Date: Tue, 2 Dec 2025 12:15:04 -0500 Subject: [PATCH 3/6] Added container registry to template file --- monitoring/tempo_container_image.template | 1 + 1 file changed, 1 insertion(+) diff --git a/monitoring/tempo_container_image.template b/monitoring/tempo_container_image.template index e2106e95..b5ee9139 100644 --- a/monitoring/tempo_container_image.template +++ b/monitoring/tempo_container_image.template @@ -1,4 +1,5 @@ tempo: + registry: __IMAGE_REGISTRY__ repository: __IMAGE_REPO_2LEVEL__ tag: __IMAGE_TAG__ pullPolicy: __IMAGE_PULL_POLICY__ From 0286441473c1a9debfc9a19d34a9e5925c1d10aa Mon Sep 17 00:00:00 2001 From: gsmith-sas <65406958+gsmith-sas@users.noreply.github.com> Date: Tue, 2 Dec 2025 12:26:23 -0500 Subject: [PATCH 4/6] Move tempo to port 3200 --- monitoring/grafana-datasource-tempo.yaml | 2 +- monitoring/openshift/tempo-values.yaml | 2 +- monitoring/values-tempo.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/monitoring/grafana-datasource-tempo.yaml b/monitoring/grafana-datasource-tempo.yaml index be81cdbb..4f95d9d9 100644 --- a/monitoring/grafana-datasource-tempo.yaml +++ b/monitoring/grafana-datasource-tempo.yaml @@ -8,7 +8,7 @@ grafana: datasources: - name: Tempo type: tempo - url: http://v4m-tempo:3100 + url: http://v4m-tempo:3200 isDefault: false editable: true jsonData: diff --git a/monitoring/openshift/tempo-values.yaml b/monitoring/openshift/tempo-values.yaml index 78640073..3cb5bccc 100644 --- a/monitoring/openshift/tempo-values.yaml +++ b/monitoring/openshift/tempo-values.yaml @@ -22,7 +22,7 @@ tempo: # Refers to https://grafana.com/docs/tempo/latest/configuration/#server server: # -- HTTP server listen port - http_listen_port: 3100 + http_listen_port: 3200 storage: trace: # tempo storage backend diff --git a/monitoring/values-tempo.yaml b/monitoring/values-tempo.yaml index 0181da88..73d0c024 100644 --- a/monitoring/values-tempo.yaml +++ b/monitoring/values-tempo.yaml @@ -33,7 +33,7 @@ tempo: # Refers to https://grafana.com/docs/tempo/latest/configuration/#server server: # -- HTTP server listen port - http_listen_port: 3100 + http_listen_port: 3200 grpc_server_max_recv_msg_size: 500000000 grpc_server_max_send_msg_size: 500000000 From 9f5b67695918840f4faac1b9cad43d8b0828aff2 Mon Sep 17 00:00:00 2001 From: gsmith-sas <65406958+gsmith-sas@users.noreply.github.com> Date: Tue, 2 Dec 2025 14:33:04 -0500 Subject: [PATCH 5/6] Tweaks to Tempo datasource definition --- monitoring/grafana-datasource-tempo.yaml | 42 +++++++++++++----------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/monitoring/grafana-datasource-tempo.yaml b/monitoring/grafana-datasource-tempo.yaml index 4f95d9d9..798d547d 100644 --- a/monitoring/grafana-datasource-tempo.yaml +++ b/monitoring/grafana-datasource-tempo.yaml @@ -5,24 +5,26 @@ grafana: datasources: datasources.yaml: apiVersion: 1 + prune: true + deleteDatasources: + - name: Tempo datasources: - - name: Tempo - type: tempo - url: http://v4m-tempo:3200 - isDefault: false - editable: true - jsonData: - tracesToLogsV2: - datasourceUid: 'ViyaLogs' - filterByTraceID: true - # spanStartTimeShift: '1h' - # spanEndTimeShift: '-1h' - # tags: ['job', 'instance', 'pod', 'namespace'] - # filterBySpanID: false - # customQuery: true - # query: 'method="${__span.tags.method}"' - serviceMap: - datasourceUid: prometheus - nodeGraph: - enabled: true - apiVersion: 1 + - name: Tempo + type: tempo + url: http://v4m-tempo:3200 + isDefault: false + editable: true + jsonData: + tracesToLogsV2: + datasourceUid: 'ViyaLogs' + filterByTraceID: true + # spanStartTimeShift: '1h' + # spanEndTimeShift: '-1h' + # tags: ['job', 'instance', 'pod', 'namespace'] + # filterBySpanID: false + # customQuery: true + # query: 'method="${__span.tags.method}"' + serviceMap: + datasourceUid: prometheus + nodeGraph: + enabled: true From adfff86590bb5065f04415b1f054681ebbe4d8d9 Mon Sep 17 00:00:00 2001 From: gsmith-sas <65406958+gsmith-sas@users.noreply.github.com> Date: Tue, 2 Dec 2025 17:34:37 -0500 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 977df3a7..06685162 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ * **Overall** * [CHANGE] Use with Kubernetes versions prior to 1.26 produce WARNING message * [CHANGE] Drop support for OpenShift 4.12; the minimum supported version of OpenShift is now 4.14 +* **Tracing** + * [UPGRADE] Upgraded Tempo from 2.7.0 to 2.9.0 + * [UPGRADE] Upgraded Tempo Helm chart from 1.18.1 to 1.24.1 ## Version 1.2.44 (18NOV2025)