From 82bbb3e78b15100af1fffdf1a8f49356072c143c Mon Sep 17 00:00:00 2001
From: Vishnu Kannan <vishnuk@google.com>
Date: Thu, 22 Jan 2015 23:33:18 +0000
Subject: [PATCH 1/2] Update monitoring components to the latest released
 versions.

---
 cluster/addons/cluster-monitoring/grafana-service.yaml     | 2 +-
 cluster/addons/cluster-monitoring/heapster-controller.yaml | 6 +++++-
 cluster/addons/cluster-monitoring/heapster-service.yaml    | 7 +++++++
 .../cluster-monitoring/influxdb-grafana-controller.yaml    | 4 ++--
 cluster/addons/cluster-monitoring/influxdb-service.yaml    | 2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 cluster/addons/cluster-monitoring/heapster-service.yaml

diff --git a/cluster/addons/cluster-monitoring/grafana-service.yaml b/cluster/addons/cluster-monitoring/grafana-service.yaml
index f791e7512e..8c86700c89 100644
--- a/cluster/addons/cluster-monitoring/grafana-service.yaml
+++ b/cluster/addons/cluster-monitoring/grafana-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: "v1beta1"
 kind: "Service"
 id: "monitoring-grafana"
-port: 8087
+port: 80
 containerPort: 80
 selector: 
   name: "influxGrafana"
diff --git a/cluster/addons/cluster-monitoring/heapster-controller.yaml b/cluster/addons/cluster-monitoring/heapster-controller.yaml
index f44f966039..d3d311edf9 100644
--- a/cluster/addons/cluster-monitoring/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/heapster-controller.yaml
@@ -12,7 +12,11 @@ desiredState:
         id: "monitoring-heapsterController"
         containers:
           - name: "heapster"
-            image: "kubernetes/heapster:v0.5"
+            image: "kubernetes/heapster:v0.6"
+            env: 
+              - name: "INFLUXDB_HOST"
+                value: "monitoring-influxdb"
+
     labels: 
       name: "heapster"
       uses: "monitoring-influxdb"
diff --git a/cluster/addons/cluster-monitoring/heapster-service.yaml b/cluster/addons/cluster-monitoring/heapster-service.yaml
new file mode 100644
index 0000000000..5a068ecbbf
--- /dev/null
+++ b/cluster/addons/cluster-monitoring/heapster-service.yaml
@@ -0,0 +1,7 @@
+apiVersion: "v1beta1"
+kind: "Service"
+id: "monitoring-heapster"
+port: 80
+containerPort: 8082
+selector: 
+  name: "heapster"
diff --git a/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
index c1855390da..1babc4239e 100644
--- a/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
@@ -14,14 +14,14 @@ desiredState:
         id: "monitoring-influxGrafanaController"
         containers: 
           - name: "influxdb"
-            image: "kubernetes/heapster_influxdb:v0.2"
+            image: "kubernetes/heapster_influxdb:v0.3"
             ports: 
               - containerPort: 8083
                 hostPort: 8083
               - containerPort: 8086
                 hostPort: 8086
           - name: "grafana"
-            image: "kubernetes/heapster_grafana:v0.2"
+            image: "kubernetes/heapster_grafana:v0.3"
             ports: 
               - containerPort: 80
                 hostPort: 80
diff --git a/cluster/addons/cluster-monitoring/influxdb-service.yaml b/cluster/addons/cluster-monitoring/influxdb-service.yaml
index ae51c3c2b2..72597d2408 100644
--- a/cluster/addons/cluster-monitoring/influxdb-service.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: "v1beta1"
 kind: "Service"
 id: "monitoring-influxdb"
-port: 8085
+port: 80
 containerPort: 8086
 selector: 
   name: "influxGrafana"

From adbbfbf62fae5031d74ce4f6f677f15d1c2ffdb4 Mon Sep 17 00:00:00 2001
From: Vishnu Kannan <vishnuk@google.com>
Date: Fri, 23 Jan 2015 18:26:21 +0000
Subject: [PATCH 2/2] Improve monitoring e2e test.

---
 hack/e2e-suite/monitoring.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hack/e2e-suite/monitoring.sh b/hack/e2e-suite/monitoring.sh
index 5820ec463d..1871b20d59 100755
--- a/hack/e2e-suite/monitoring.sh
+++ b/hack/e2e-suite/monitoring.sh
@@ -51,6 +51,10 @@ function setup {
 function cleanup {
   "${KUBECFG}" resize monitoring-influxGrafanaController 0 &> /dev/null || true
   "${KUBECFG}" resize monitoring-heapsterController 0 &> /dev/null || true
+  while kubectl.sh get pods -l "name=influxGrafana" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null \
+    || kubectl.sh get pods -l "name=heapster" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null; do
+    sleep 2
+  done
   "${KUBECTL}" delete -f "${MONITORING}/" &> /dev/null || true
 
   # This only has work to do on gce and gke
@@ -104,6 +108,9 @@ function wait-for-pods {
 
 trap cleanup EXIT
 
+# Remove any pre-existing monitoring services.
+cleanup 
+
 # Start monitoring pods and services.
 setup