Add the possibility to mount grafana config (#1047)

* Add the possibility to mount grafana config

* Bump grafana version

* Bump kube-prometheus version

* Rebase master and bump grafan and kube-prometheus versions

helm/grafana/Chart.yaml

@@ -8,4 +8,4 @@ maintainers:
 name: grafana
 sources:
 - https://github.com/coreos/prometheus-operator
-version: 0.0.22
+version: 0.0.23

helm/grafana/templates/grafana-deployment.yaml

@@ -39,10 +39,14 @@ spec:
               key: password
 {{- if .Values.extraVars }}
 {{ toYaml .Values.extraVars | indent 8 }}
-{{- end }} 
+{{- end }}
         volumeMounts:
         - name: grafana-storage
           mountPath: /var/lib/grafana
+      {{- if .Values.mountGrafanaConfig }}
+        - name: grafana-config
+          mountPath: /etc/grafana
+      {{- end }}
         ports:
         - name: web
           containerPort: 3000
@@ -53,7 +57,7 @@ spec:
           periodSeconds: 1
           timeoutSeconds: 1
           successThreshold: 1
-          failureThreshold: 10             
+          failureThreshold: 10
         resources:
           requests:
             memory: 100Mi
@@ -106,3 +110,9 @@ spec:
         - name: grafana-dashboards
           configMap:
             name: {{ template "grafana.server.fullname" . }}
+      {{- if .Values.mountGrafanaConfig }}
+        - name: grafana-config
+          hostPath:
+            path: /etc/grafana
+            type: directory
+      {{- end }}

helm/grafana/values.yaml

@@ -20,6 +20,10 @@ annotations: {}
 #   value: extra-var-value-2
 extraVars:
 
+## Change to true override Grafana's default config.
+## Make sure grafana.ini is present on /etc/grafana
+mountGrafanaConfig: false
+
 adminUser: "admin"
 adminPassword: "admin"
 

helm/kube-prometheus/Chart.yaml

@@ -9,4 +9,4 @@ maintainers:
 name: kube-prometheus
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.0.37
+version: 0.0.38

helm/kube-prometheus/requirements.yaml

@@ -52,7 +52,7 @@ dependencies:
     condition: deployExporterNode
 
   - name: grafana
-    version: 0.0.22
+    version: 0.0.23
     #e2e-repository: file://../grafana
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
     condition: deployGrafana