home/helm-charts
2
0
Fork 0
mirror of https://github.com/wahyd4/helm-charts.git synced 2026-08-09 04:26:02 +10:00
Code Issues Packages Projects Releases Wiki Activity

[stable/grafana] Template grafana.additionalDataSources (#22728)

Browse Source 
Signed-off-by: Steven Sheehy <steven.sheehy@hedera.com>
This commit is contained in:
Steven Sheehy
2020-06-15 16:59:57 -07:00
committed by GitHub
parent 16face3083
commit 2a51b5e930
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/prometheus-operator/Chart.yaml
+1 -1
View File
@@ -12,7 +12,7 @@ sources:
- https://github.com/coreos/kube-prometheus
- https://github.com/coreos/prometheus-operator
- https://coreos.com/operators/prometheus
version: 8.14.0
version: 8.14.1
appVersion: 0.38.1
tillerVersion: ">=2.12.0"
home: https://github.com/coreos/prometheus-operator
charts/prometheus-operator/README.md
+1 -1
View File
@@ -443,7 +443,7 @@ For a full list of configurable values please refer to the [Grafana chart](https
| Parameter | Description | Default |
| ----- | ----------- | ------ |
| `grafana.additionalDataSources` | Configure additional grafana datasources | `[]` |
| `grafana.additionalDataSources` | Configure additional grafana datasources (passed through tpl) | `[]` |
| `grafana.adminPassword` | Admin password to log into the grafana UI | "prom-operator" |
| `grafana.defaultDashboardsEnabled` | Deploy default dashboards. These are loaded using the sidecar | `true` |
| `grafana.enabled` | If true, deploy the grafana sub-chart | `true` |
charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml
+1 -1
View File
@@ -33,6 +33,6 @@ data:
{{- end }}
{{- end }}
{{- if .Values.grafana.additionalDataSources }}
{{ toYaml .Values.grafana.additionalDataSources | indent 4}}
{{ tpl (toYaml .Values.grafana.additionalDataSources | indent 4) . }}
{{- end }}
{{- end }}
charts/prometheus-operator/values.yaml
+2 -2
View File
@@ -538,7 +538,7 @@ grafana:
# configMap: certs-configmap
# readOnly: true
## Configure additional grafana datasources
## Configure additional grafana datasources (passed through tpl)
## ref: http://docs.grafana.org/administration/provisioning/#datasources
additionalDataSources: []
# - name: prometheus-sample
@@ -551,7 +551,7 @@ grafana:
# tlsSkipVerify: true
# orgId: 1
# type: prometheus
# url: https://prometheus.svc:9090
# url: https://{{ printf "%s-prometheus.svc" .Release.Name }}:9090
# version: 1
## Passed to grafana subchart and used by servicemonitor below