From 6b5765e250f10d1612e3750139962a6ae0d907f9 Mon Sep 17 00:00:00 2001 From: josunect Date: Thu, 17 Oct 2024 11:12:29 +0100 Subject: [PATCH 1/2] Update tracing section --- .../docs/Configuration/p8s-jaeger-grafana/tracing/tempo.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/content/en/docs/Configuration/p8s-jaeger-grafana/tracing/tempo.md b/content/en/docs/Configuration/p8s-jaeger-grafana/tracing/tempo.md index e6348df4a..69a6da521 100644 --- a/content/en/docs/Configuration/p8s-jaeger-grafana/tracing/tempo.md +++ b/content/en/docs/Configuration/p8s-jaeger-grafana/tracing/tempo.md @@ -40,21 +40,24 @@ spec: tempo_config: org_id: "1" datasource_uid: "a8d2ef1c-d31c-4de5-a90b-e7bc5252cd00" + url_format: "grafana" use_grpc: false # Public facing URL of Tempo external_url: "https://tempo-tempo-query-frontend-tempo.apps-crc.testing/" ``` -The default UI for Grafana Tempo is Grafana, so we should also set the Grafana URL in the Kiali configuration, such as this example: +Kiali will use the _external_url_ to redirect to the Tracing UI, in the "View in tracing" links. +In Tempo, by default, the _url_format_ is set to _grafana_. This will use a particular url path and query for each link. The default UI for Grafana Tempo is Grafana, so it will use the _external_url_ set in the Grafana section, such as this example: ```yaml spec: external_services: grafana: - internal_url: http://grafana.istio-system:3000 external_url: https://grafana.apps-crc.testing/ ``` +It is also possible to set _url_format_ to "jaeger". In that case, Kiali will use the _external_url_ set in the tracing section, and the url path and query will be following the Jaeger UI format. + #### Set up a Tempo Datasource in Grafana We can optionally set up a default [Tempo datasource](https://grafana.com/docs/grafana/latest/datasources/tempo/) in Grafana so that you can view the Tempo tracing data within the Grafana UI, as you see here: From d725ce5cb9ba300a4feb48f3f036581110e0da43 Mon Sep 17 00:00:00 2001 From: josunect Date: Thu, 17 Oct 2024 13:41:45 +0100 Subject: [PATCH 2/2] update grafana tempo --- .../en/docs/Configuration/p8s-jaeger-grafana/tracing/tempo.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/en/docs/Configuration/p8s-jaeger-grafana/tracing/tempo.md b/content/en/docs/Configuration/p8s-jaeger-grafana/tracing/tempo.md index 69a6da521..2ee66c076 100644 --- a/content/en/docs/Configuration/p8s-jaeger-grafana/tracing/tempo.md +++ b/content/en/docs/Configuration/p8s-jaeger-grafana/tracing/tempo.md @@ -53,6 +53,7 @@ In Tempo, by default, the _url_format_ is set to _grafana_. This will use a part spec: external_services: grafana: + enabled: true external_url: https://grafana.apps-crc.testing/ ```