From a204a5e09cff9252fbfc0c9039173520a0e2732b Mon Sep 17 00:00:00 2001 From: Josune Cordoba <49480155+josunect@users.noreply.github.com> Date: Tue, 26 Sep 2023 07:51:58 +0100 Subject: [PATCH] Create provider field in the tracing config (#679) * Create provider field in the tracing config * typo --- crd-docs/cr/kiali.io_v1alpha1_kiali.yaml | 1 + crd-docs/crd/kiali.io_kialis.yaml | 5 ++++- roles/default/kiali-deploy/defaults/main.yml | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml b/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml index 89ab7bcc..1603ccc4 100644 --- a/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml +++ b/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml @@ -331,6 +331,7 @@ spec: in_cluster_url: "" is_core: false namespace_selector: true + provider: "jaeger" # default: query_scope is empty query_scope: mesh_id: "mesh-1" diff --git a/crd-docs/crd/kiali.io_kialis.yaml b/crd-docs/crd/kiali.io_kialis.yaml index 718a9164..839c2729 100644 --- a/crd-docs/crd/kiali.io_kialis.yaml +++ b/crd-docs/crd/kiali.io_kialis.yaml @@ -863,7 +863,7 @@ spec: description: "The URL used to query the Prometheus Server. This URL must be accessible from the Kiali pod. If empty, the default will assume Prometheus is in the Istio control plane namespace; e.g. `http://prometheus.:9090`." type: string tracing: - description: "Configuration used to access the Tracing (Jaeger) dashboards." + description: "Configuration used to access the Tracing (Jaeger or Tempo) dashboards." type: object properties: auth: @@ -903,6 +903,9 @@ spec: namespace_selector: description: "Kiali use this boolean to find traces with a namespace selector : service.namespace." type: boolean + provider: + description: "The trace provider to get the traces from. Value must be one of: `jaeger` or `tempo`." + type: string query_scope: description: "A set of tagKey/tagValue settings applied to every Jaeger query. Used to narrow unified traces to only those scoped to the Kiali instance." type: object diff --git a/roles/default/kiali-deploy/defaults/main.yml b/roles/default/kiali-deploy/defaults/main.yml index d8ca6346..1bfa1b17 100644 --- a/roles/default/kiali-deploy/defaults/main.yml +++ b/roles/default/kiali-deploy/defaults/main.yml @@ -220,6 +220,7 @@ kiali_defaults: in_cluster_url: "" is_core: false namespace_selector: true + provider: "jaeger" query_scope: {} query_timeout: 5 url: ""