Merge pull request kubernetes#22347 from mwielgus/grafana-bump

Update Grafana to support new Influxdb/Heapster schema
zmerlynn · Mar 2, 2016 · 2b026ec · 2b026ec
2 parents 73b39e9 + f85c50b
commit 2b026ec
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
@@ -38,7 +38,7 @@ spec:
           volumeMounts:
           - name: influxdb-persistent-storage
             mountPath: /data
-        - image: gcr.io/google_containers/heapster_grafana:v2.1.1
+        - image: gcr.io/google_containers/heapster_grafana:v2.6.0-2
           name: grafana
           env:
           resources: