Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update observability tracing config options #733

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions crd-docs/cr/kiali.io_v1alpha1_kiali.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -448,14 +448,13 @@ spec:
enabled: true
port: 9090
tracing:
collector_type: "jaeger"
collector_url: "http://jaeger-collector.istio-system:14268/api/traces"
collector_url: "jaeger-collector.istio-system:4318"
enabled: false
otel:
protocol: "http"
tls_config:
ca_name: ""
protocol: "http"
enabled: false
skip_verify: false
tls_enabled: false
port: 20001
web_fqdn: ""
web_history_mode: ""
Expand Down
19 changes: 8 additions & 11 deletions crd-docs/crd/kiali.io_kialis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1284,31 +1284,28 @@ spec:
description: "Settings that control how the Kiali server itself emits its own tracing data."
type: object
properties:
collector_type:
description: "The collector type to use. Value must be one of: `jaeger` or `otel`."
type: string
collector_url:
description: "The URL used to determine where the Kiali server tracing data will be stored."
type: string
enabled:
description: "When true, the Kiali server itself will product its own tracing data."
type: boolean
otel:
description: "Specific properties when the collector type is `otel`."
protocol:
description: "Protocol. Supported values are: `http`, `https` or `grpc`."
type: string
tls_config:
description: "Specific tls properties when `tls_enabled` is `true`."
type: object
properties:
ca_name:
description: "The name of the CA cert; this is used when `tls_enabled` is `true` and `skip_verify` is `false`."
type: string
protocol:
description: "Protocol. Supported values are: `http`, `https` or `grpc`."
type: string
enabled:
description: "Enable TLS for the collector. This must be specified when `protocol` is `https` or `grpc`. When you set this to `true`, you must also set a `ca_name` or set `skip_verify` to true."
type: boolean
skip_verify:
description: "If true, TLS certificate verification will not be performed. This is an unsecure option and is recommended only for testing."
type: boolean
tls_enabled:
description: "Enable TLS for the collector. This must be specified when `protocol` is `https` or `grpc`. When you set this to `true`, you must also set a `ca_name` or set `skip_verify` to true."
type: boolean
port:
description: "The port that the server will bind to in order to receive console and API requests."
type: integer
Expand Down
9 changes: 4 additions & 5 deletions roles/default/kiali-deploy/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -332,14 +332,13 @@ kiali_defaults:
enabled: true
port: 9090
tracing:
collector_type: "jaeger"
collector_url: http://jaeger-collector.istio-system:14268/api/traces
collector_url: jaeger-collector.istio-system:4318
enabled: false
otel:
protocol: "http"
tls_config:
ca_name: ""
protocol: "http"
enabled: false
skip_verify: false
tls_enabled: false
port: 20001
web_fqdn: ""
web_history_mode: ""
Expand Down
Loading