openstack/openstack-helm-infra
Code Issues Proposed changes

Grafana: Add support for arbitrary environment variables

Browse Source 
This updates the Grafana chart to support the definition of
arbitrary environment variables to support scenarios where
additional information may be required at runtime for things like
datasource and dashboard provisioning

Change-Id: I95e4abe9030116a440c6d78a1d14dbcaaf743b40
Signed-off-by: Steve Wilkerson <sw5822@att.com>
This commit is contained in:
Steve Wilkerson 2019-11-20 09:58:12 -06:00 committed by Steve Wilkerson
parent 0edd3e18de
commit a4816feda2
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
grafana/templates/deployment.yaml
View File

@ -83,6 +83,9 @@ spec:
key: GRAFANA_ADMIN_PASSWORD key: GRAFANA_ADMIN_PASSWORD
- name: PROMETHEUS_URL - name: PROMETHEUS_URL
value: {{ tuple "monitoring" "internal" "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} value: {{ tuple "monitoring" "internal" "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}
{{- if .Values.pod.env.grafana }}
{{ include "helm-toolkit.utils.to_k8s_env_vars" .Values.pod.env.grafana | indent 12 }}
{{- end }}
volumeMounts: volumeMounts:
- name: pod-tmp - name: pod-tmp
mountPath: /tmp mountPath: /tmp

2
grafana/values.yaml
View File

@ -43,6 +43,8 @@ labels:
node_selector_value: enabled node_selector_value: enabled
pod: pod:
env:
grafana: null
security_context: security_context:
dashboard: dashboard:
pod: pod: