Skip to content

Commit 264920f

Browse files
authored
Merge pull request #96998 from openshift-cherrypick-robot/cherry-pick-96406-to-service-mesh-docs-3.0
[service-mesh-docs-3.0] OSSM-9075: Minor updates for Kiali and Distributed Tracing
2 parents 94a89d8 + 04121fa commit 264920f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

modules/ossm-config-otel-kiali.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
use_grpc: false
3030
internal_url: https://tempo-sample-gateway.tempo.svc.cluster.local:8080/api/traces/v1/default/tempo #<3>
3131
external_url: https://tempo-sample-gateway-tempo.apps-crc.testing/api/traces/v1/default/search #<4>
32-
health_check_url: https://tempo-sample-gateway-tempo.apps-crc.testing/api/traces/v1/north/tempo/api/echo #<5>
32+
health_check_url: https://tempo-sample-gateway-tempo.apps-crc.testing/api/traces/v1/default/tempo/api/echo #<5>
3333
auth: #<6>
3434
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
3535
insecure_skip_verify: false
@@ -39,10 +39,10 @@ spec:
3939
url_format: "jaeger" #<7>
4040
----
4141
<1> Specifies whether tracing is enabled.
42-
<2> Specifies either {TempoShortName} or {JaegerShortName}. Tempo can expose a Jaeger or Tempo API.
43-
<3> Specifies the internal URL for the Tempo API. If Tempo is deployed in a multi-tenant model, you must include the `tenant name` name.
44-
<4> Specifies the {ocp-short-name} route for the Jaeger UI. When deployed in a multi-tenant model, the gateway creates the route. Otherwise, you must create the route in the `Tempo` namespace. You can manually create the route for the `tempo-sample-query-frontend` service or update the `Tempo` CR with `.spec.template.queryFrontend.jaegerQuery.ingress.type: route`.
45-
<5> Specifies the health check URL. Not required by default. When Tempo is deployed in a multi-tenant model, Kiali does not expose the default health check URL. This is an example of a valid health URL.
42+
<2> Specifies either {TempoShortName} or {JaegerShortName}. The {DTShortName} can expose a Jaeger API or a Tempo API.
43+
<3> Specifies the internal URL for the Tempo API. When you deploy the {DTShortName} in multitenancy, include the tenant name in the URL path of the `internal_url` parameter. In this example, `default` represents the tenant name.
44+
<4> Specifies the {ocp-short-name} route for the Jaeger UI. When you deploy the {DTShortName} in multitenancy, the gateway creates the route. Otherwise, you must create the route in the `Tempo` namespace. You can manually create the route for the `tempo-sample-query-frontend` service or update the `Tempo` custom resource with `.spec.template.queryFrontend.jaegerQuery.ingress.type: route`.
45+
<5> Specifies the health check URL. Not required by default. When you deploy the {DTShortName} in multitenancy, it does not expose the default health check URL. This is an example of a valid health URL.
4646
<6> Specifies the configuration used when the access URL is `HTTPS` or requires authentication. Not required by default.
4747
<7> Specifies the configuration that defaults to `grafana`. Not required by default. Change to `jaeger` if the Kiali `View in tracing` link redirects to the Jaeger console UI.
4848

0 commit comments

Comments
 (0)