From a6317892394d3830be19f5e69417e51ca86125f4 Mon Sep 17 00:00:00 2001 From: josunect Date: Tue, 3 Sep 2024 12:21:50 +0100 Subject: [PATCH] Add auth section for each external services --- .../p8s-jaeger-grafana/grafana.md | 19 ++++++++++++++++ .../p8s-jaeger-grafana/prometheus.md | 18 +++++++++++++++ .../p8s-jaeger-grafana/tracing/jaeger.md | 19 ++++++++++++++++ .../p8s-jaeger-grafana/tracing/tempo.md | 22 ++++++++++++++++++- 4 files changed, 77 insertions(+), 1 deletion(-) diff --git a/content/en/docs/Configuration/p8s-jaeger-grafana/grafana.md b/content/en/docs/Configuration/p8s-jaeger-grafana/grafana.md index fe2ebf4b6..23b679e98 100644 --- a/content/en/docs/Configuration/p8s-jaeger-grafana/grafana.md +++ b/content/en/docs/Configuration/p8s-jaeger-grafana/grafana.md @@ -51,3 +51,22 @@ spec: The described configuration is done in the Kiali CR when Kiali is installed using the Kiali Operator. If Kiali is installed with the Helm chart then the correct way to configure this is via regular --set flags. {{% /alert %}} +### Grafana authentication configuration + +The Kiali CR provides authentication configuration that will be used also for querying the version check to provide information in the Mesh graph. + +```yaml +spec: + external_services: + grafana: + enabled: true + auth: + ca_file: "" + insecure_skip_verify: false + password: "pwd" + token: "" + type: "basic" + use_kiali_token: false + username: "user" + health_check_url: "" +``` \ No newline at end of file diff --git a/content/en/docs/Configuration/p8s-jaeger-grafana/prometheus.md b/content/en/docs/Configuration/p8s-jaeger-grafana/prometheus.md index 0eda98a89..b00e3bace 100644 --- a/content/en/docs/Configuration/p8s-jaeger-grafana/prometheus.md +++ b/content/en/docs/Configuration/p8s-jaeger-grafana/prometheus.md @@ -169,4 +169,22 @@ The recommendation for Kiali is to set the shortest retention time that meets yo For more information, see the [Prometheus documentation](https://prometheus.io/docs/prometheus/latest/storage/#operational-aspects). +### Prometheus authentication configuration +The Kiali CR provides authentication configuration that will be used also for querying the version check to provide information in the Mesh graph. + +```yaml +spec: + external_services: + prometheus: + enabled: true + auth: + ca_file: "" + insecure_skip_verify: false + password: "pwd" + token: "" + type: "basic" + use_kiali_token: false + username: "user" + health_check_url: "" +``` \ No newline at end of file diff --git a/content/en/docs/Configuration/p8s-jaeger-grafana/tracing/jaeger.md b/content/en/docs/Configuration/p8s-jaeger-grafana/tracing/jaeger.md index b7934c301..fd4d2b131 100644 --- a/content/en/docs/Configuration/p8s-jaeger-grafana/tracing/jaeger.md +++ b/content/en/docs/Configuration/p8s-jaeger-grafana/tracing/jaeger.md @@ -52,3 +52,22 @@ If your Jaeger setup differs significantly from the sample add-ons, make sure that Istio is also properly configured to push traces to the right URL. {{% /alert %}} +### Jaeger authentication configuration + +The Kiali CR provides authentication configuration that will be used also for querying the version check to provide information in the Mesh graph. + +```yaml +spec: + external_services: + tracing: + enabled: true + auth: + ca_file: "" + insecure_skip_verify: false + password: "pwd" + token: "" + type: "basic" + use_kiali_token: false + username: "user" + health_check_url: "" +``` \ No newline at end of file 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 2dfaeba92..b0018c7d6 100644 --- a/content/en/docs/Configuration/p8s-jaeger-grafana/tracing/tempo.md +++ b/content/en/docs/Configuration/p8s-jaeger-grafana/tracing/tempo.md @@ -231,4 +231,24 @@ In `external_services.tracing` | |
http
|
grpc
| |--------|-------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Jaeger | `.in_cluster_url = 'http://jaeger_service_url:16686/jaeger'`
`.use_grpc = false`
| `.in_cluster_url = 'http://jaeger_service_url:16685/jaeger'`
`.use_grpc = true (Not required: by default)`

| -| Tempo |
`in_cluster_url = 'http://query_frontend_url:3200'`
`.use_grpc = false`
`.provider = 'tempo'`

| `.in_cluster_url = 'http://query_frontend_url:3200'`
`.grpc_port: 9095`
`.provider: 'tempo'`
`.use_grpc = true (Not required: by default)`
| \ No newline at end of file +| Tempo |
`in_cluster_url = 'http://query_frontend_url:3200'`
`.use_grpc = false`
`.provider = 'tempo'`

| `.in_cluster_url = 'http://query_frontend_url:3200'`
`.grpc_port: 9095`
`.provider: 'tempo'`
`.use_grpc = true (Not required: by default)`
| + +### Tempo authentication configuration + +The Kiali CR provides authentication configuration that will be used also for querying the version check to provide information in the Mesh graph. + +```yaml +spec: + external_services: + tracing: + enabled: true + auth: + ca_file: "" + insecure_skip_verify: false + password: "pwd" + token: "" + type: "basic" + use_kiali_token: false + username: "user" + health_check_url: "" +``` \ No newline at end of file