Merge pull request kubernetes-retired#824 from antoineco/grafana-dash-v7

Update Grafana and default dashboards
jcookeee · Jan 14, 2016 · 87a287c · 87a287c
2 parents 7ce54ab + c4930c4
commit 87a287c
Show file tree

Hide file tree

Showing 5 changed files with 619 additions and 420 deletions.
diff --git a/grafana/Dockerfile b/grafana/Dockerfile
@@ -2,7 +2,7 @@
 # Stock Grafana + a few custom dashboards
 #
 
-FROM grafana/grafana:2.5.0
+FROM grafana/grafana:2.6.0
 
 RUN apt-get update && \
     apt-get install -y curl

diff --git a/grafana/Makefile b/grafana/Makefile
@@ -1,5 +1,5 @@
 
-TAG = v2.5.0
+TAG = v2.6.0
 PREFIX = kubernetes
 
 all: container

diff --git a/grafana/RELEASES.md b/grafana/RELEASES.md
@@ -1,5 +1,12 @@
 # Release Notes for Grafana container.
 
+## 2.6.0 (29-12-2015)
+- Support Grafana 2.6.0.
+- Improve default dashboards
+  - Accurate CPU metrics
+  - Cluster network graphs
+  - Fix data aggregation
+
 ## 2.5.0 (12-11-2015)
 - Support Grafana 2.5.0.