Skip to content

Commit

Permalink
allow user to be able to set grafana in_cluster_url to empty string (#…
Browse files Browse the repository at this point in the history
…391)

part of: kiali/kiali#4261

Co-authored-by: John Mazzitelli <[email protected]>
  • Loading branch information
xeviknal and jmazzitelli authored Aug 5, 2021
1 parent 6bebe55 commit e4436a6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions deploy/kiali/kiali_cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ spec:
# workload: The name of a variable that holds the workload name, if used in that dashboard (else it must be omitted)
# enabled: When true, Grafana support will be enabled in Kiali.
# health_check_url: Used in the Components health feature. This is the url which kiali will ping to determine whether the component is reachable or not. It defaults to `in_cluster_url` when not provided.
# in_cluster_url: Set URL for in-cluster access. Example: "http://grafana.istio-system:3000". This URL can contain query parameters if needed, such as "?orgId=1".
# in_cluster_url: Set URL for in-cluster access. Example: "http://grafana.istio-system:3000". This URL can contain query parameters if needed, such as "?orgId=1". If not defined, it will default to "http://grafana.<istio_namespace>:3000".
# is_core: Used in the Components health feature. When true, the unhealthy scenarios will be raised as errors. Otherwise, they will be raised as a warning.
# url: The URL that Kiali uses when integrating with Grafana. This URL must be accessible to clients external to
# the cluster in order for the integration to work properly. If empty, an attempt to auto-discover it is made.
Expand Down Expand Up @@ -518,7 +518,7 @@ spec:
# - name: "Istio Wasm Extension Dashboard"
# enabled: true
# health_check_url: ""
# in_cluster_url: "http://grafana.istio-system:3000"
# #in_cluster_url
# is_core: false
# url: ""
#
Expand Down
2 changes: 1 addition & 1 deletion roles/default/kiali-deploy/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ kiali_defaults:
- name: "Istio Wasm Extension Dashboard"
enabled: true
health_check_url: ""
in_cluster_url: ""
#in_cluster_url
is_core: false
url: ""
istio:
Expand Down
2 changes: 1 addition & 1 deletion roles/default/kiali-deploy/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
set_fact:
kiali_vars: "{{ kiali_vars | combine({'external_services': {'grafana': {'in_cluster_url': 'http://grafana.' + kiali_vars.istio_namespace + ':3000'}}}, recursive=True) }}"
when:
kiali_vars.external_services.grafana.in_cluster_url == ""
kiali_vars.external_services.grafana.in_cluster_url is not defined

- name: Set default Tracing in_cluster_url for Maistra
set_fact:
Expand Down

0 comments on commit e4436a6

Please sign in to comment.