Create provider field in the tracing config (#679)

* Create provider field in the tracing config * typo
kiali · Sep 26, 2023 · a204a5e · a204a5e
1 parent 1b7937d
commit a204a5e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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.<istio_namespace>: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
@@ -220,6 +220,7 @@ kiali_defaults:
       in_cluster_url: ""
       is_core: false
       namespace_selector: true
+      provider: "jaeger"
       query_scope: {}
       query_timeout: 5
       url: ""