github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-22 22:07:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make grafana default datasource optional (#12895)

Browse Source 
* make default ds optional

Signed-off-by: Rafael Jesus <rafaelljesus86@gmail.com>

* add example on ci folder

Signed-off-by: Rafael Jesus <rafaelljesus86@gmail.com>
This commit is contained in:
Rafael Jesus
2019-04-08 02:40:29 -07:00
committed by Kubernetes Prow Robot
parent 5847aec24a
commit eb7c2d5cef
5 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/prometheus-operator/Chart.yaml
+1 -1
View File
@@ -9,7 +9,7 @@ name: prometheus-operator
sources:
- https://github.com/coreos/prometheus-operator
- https://coreos.com/operators/prometheus
version: 5.0.7
version: 5.0.8
appVersion: 0.29.0
home: https://github.com/coreos/prometheus-operator
keywords:
stable/prometheus-operator/README.md
+1
View File
@@ -302,6 +302,7 @@ The following tables list the configurable parameters of the prometheus-operator
| `grafana.sidecar.dashboards.enabled` | Enable the Grafana sidecar to automatically load dashboards with a label `{{ grafana.sidecar.dashboards.label }}=1` | `true` |
| `grafana.sidecar.dashboards.label` | If the sidecar is enabled, configmaps with this label will be loaded into Grafana as dashboards | `grafana_dashboard` |
| `grafana.sidecar.datasources.enabled` | Enable the Grafana sidecar to automatically load dashboards with a label `{{ grafana.sidecar.datasources.label }}=1` | `true` |
| `grafana.sidecar.datasources.defaultDatasourceEnabled` | Enable Grafana `Prometheus` default datasource` | `true` |
| `grafana.sidecar.datasources.label` | If the sidecar is enabled, configmaps with this label will be loaded into Grafana as datasources configurations | `grafana_datasource` |
| `grafana.rbac.pspUseAppArmor` | Enforce AppArmor in created PodSecurityPolicy (requires rbac.pspEnabled) | `true` |
| `grafana.extraConfigmapMounts` | Additional grafana server configMap volume mounts | `[]` |
stable/prometheus-operator/ci/test-values.yaml
+1
View File
@@ -360,6 +360,7 @@ grafana:
label: grafana_dashboard
datasources:
enabled: true
defaultDatasourceEnabled: true
label: grafana_datasource
extraConfigmapMounts: []
stable/prometheus-operator/templates/grafana/configmaps-datasources.yaml
+2
View File
@@ -11,11 +11,13 @@ data:
datasource.yaml: |-
apiVersion: 1
datasources:
{{- if .Values.grafana.sidecar.datasources.defaultDatasourceEnabled }}
- name: Prometheus
type: prometheus
url: http://{{ template "prometheus-operator.fullname" . }}-prometheus:9090/{{ trimPrefix "/" .Values.prometheus.prometheusSpec.routePrefix }}
access: proxy
isDefault: true
{{- end }}
{{- if .Values.grafana.additionalDataSources }}
{{ toYaml .Values.grafana.additionalDataSources | indent 4}}
{{- end }}
stable/prometheus-operator/values.yaml
+1
View File
@@ -360,6 +360,7 @@ grafana:
label: grafana_dashboard
datasources:
enabled: true
defaultDatasourceEnabled: true
label: grafana_datasource
extraConfigmapMounts: []