Skip to content

Commit

Permalink
[stable/grafana] Fix conflict when using multiple grafana providers (h…
Browse files Browse the repository at this point in the history
…elm#19177)

* Trying to alleviate change introduced in helm#15770 by making multiple
provisioners optional. Also bumped version and added entry to README.

Signed-off-by: Borna Skukan <skuxay@gmail.com>

* Further version bump

Signed-off-by: Borna Skukan <skuxay@gmail.com>

* Making default behaviour same as before

Signed-off-by: Borna Skukan <skuxay@gmail.com>
  • Loading branch information
skuxy authored and WyriHaximus committed Dec 14, 2019
1 parent 1425788 commit 41aee64
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion stable/grafana/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 1 addition & 0 deletions stable/grafana/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | `""` |
Expand Down
4 changes: 3 additions & 1 deletion stable/grafana/templates/_pod.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions stable/grafana/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 41aee64

Please sign in to comment.