diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml index ccdb95bcef..5c74de2284 100644 --- a/stable/grafana/Chart.yaml +++ b/stable/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: grafana -version: 4.1.0 +version: 4.1.1 appVersion: 6.5.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/stable/grafana/README.md b/stable/grafana/README.md index fcc14de930..be6e6fb8ba 100644 --- a/stable/grafana/README.md +++ b/stable/grafana/README.md @@ -113,6 +113,7 @@ This version requires Helm >= 2.12.0. | `sidecar.imagePullPolicy` | Sidecar image pull policy | `IfNotPresent` | | `sidecar.resources` | Sidecar resources | `{}` | | `sidecar.dashboards.enabled` | Enables the cluster wide search for dashboards and adds/updates/deletes them in grafana | `false` | +| `sidecar.dashboards.SCProvider` | Enables creation of sidecar provider | `true` | `sidecar.dashboards.provider.name` | Unique name of the grafana provider | `sidecarProvider` | | `sidecar.dashboards.provider.orgid` | Id of the organisation, to which the dashboards should be added | `1` | | `sidecar.dashboards.provider.folder` | Logical folder in which grafana groups dashboards | `""` | diff --git a/stable/grafana/templates/_pod.tpl b/stable/grafana/templates/_pod.tpl index 8018dd7e23..e31396ccbe 100644 --- a/stable/grafana/templates/_pod.tpl +++ b/stable/grafana/templates/_pod.tpl @@ -184,10 +184,12 @@ containers: {{- if .Values.sidecar.dashboards.enabled }} - name: sc-dashboard-volume mountPath: {{ .Values.sidecar.dashboards.folder | quote }} +{{ if .Values.sidecar.dashboards.SCProvider }} - name: sc-dashboard-provider mountPath: "/etc/grafana/provisioning/dashboards/sc-dashboardproviders.yaml" subPath: provider.yaml {{- end}} +{{- end}} {{- if .Values.sidecar.datasources.enabled }} - name: sc-datasources-volume mountPath: "/etc/grafana/provisioning/datasources" @@ -332,7 +334,7 @@ volumes: {{- if .Values.sidecar.dashboards.enabled }} - name: sc-dashboard-volume emptyDir: {} -{{- if .Values.sidecar.dashboards.enabled }} +{{- if .Values.sidecar.dashboards.SCProvider }} - name: sc-dashboard-provider configMap: name: {{ template "grafana.fullname" . }}-config-dashboards diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml index 0b06a7d2ea..648787156b 100644 --- a/stable/grafana/values.yaml +++ b/stable/grafana/values.yaml @@ -432,6 +432,7 @@ sidecar: # skipTlsVerify: true dashboards: enabled: false + SCProvider: true # label that the configmaps with dashboards are marked with label: grafana_dashboard # folder in the pod that should hold the collected dashboards (unless `defaultFolderName` is set)