From e89dd7e235b136145e78e76af259b8d227fd9951 Mon Sep 17 00:00:00 2001
From: Vishnu Kannan <vishnuk@google.com>
Date: Sat, 14 Mar 2015 19:00:18 +0000
Subject: [PATCH] Updating heapster version to v0.9. Updated the e2e test to
 work with the new version.

---
 .../cluster-monitoring/heapster-controller.yaml     | 13 ++++++++++++-
 .../influxdb-grafana-controller.yaml                |  6 ++++--
 test/e2e/monitoring.go                              |  6 +++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/cluster/addons/cluster-monitoring/heapster-controller.yaml b/cluster/addons/cluster-monitoring/heapster-controller.yaml
index 9ae6d41c03..d448d5b49a 100644
--- a/cluster/addons/cluster-monitoring/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/heapster-controller.yaml
@@ -12,10 +12,21 @@ desiredState:
         id: monitoring-heapster
         containers:
           - name: heapster
-            image: kubernetes/heapster:v0.8
+            image: kubernetes/heapster:v0.9
             env: 
               - name: "INFLUXDB_HOST"
                 value: "monitoring-influxdb"
+              - name: "SINK"
+                value: "influxdb"
+            volumeMounts:
+              - name: ssl-certs
+                mountPath: /etc/ssl/certs
+                readOnly: true
+        volumes:
+          - name: ssl-certs
+            source:
+              hostDir:
+                path: /etc/ssl/certs
     labels: 
       name: heapster
       uses: monitoring-influxdb
diff --git a/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
index 7456d43282..3e5c2fac41 100644
--- a/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
@@ -22,7 +22,7 @@ desiredState:
               - containerPort: 8086
                 hostPort: 8086
           - name: grafana
-            image: kubernetes/heapster_grafana:v0.4
+            image: kubernetes/heapster_grafana:v0.5
             env: 
               - name: "HTTP_USER"
                 value: "admin"
@@ -31,9 +31,11 @@ desiredState:
               - name: "INFLUXDB_PROTO"
                 value: "https"
               - name: "INFLUXDB_HOST"
-                value: '"+window.location.hostname+"/api/v1beta1/proxy/services/monitoring-influxdb'
+                value: "localhost"
               - name: "INFLUXDB_PORT"
                 value: ""
+              - name: "KUBERNETES_API_PORT"
+                value: ""
 labels:
   name: influxGrafana
   kubernetes.io/cluster-service: "true"
diff --git a/test/e2e/monitoring.go b/test/e2e/monitoring.go
index 8a6507a27c..2a7e2d306c 100644
--- a/test/e2e/monitoring.go
+++ b/test/e2e/monitoring.go
@@ -54,8 +54,8 @@ const (
 	influxdbDatabaseName = "k8s"
 	influxdbUser         = "root"
 	influxdbPW           = "root"
-	podlistQuery         = "select distinct(pod) from stats"
-	nodelistQuery        = "select distinct(hostname) from machine"
+	podlistQuery         = "select distinct(pod_id) from /cpu.*/"
+	nodelistQuery        = "select distinct(hostname) from /cpu.*/"
 	sleepBetweenAttempts = 5 * time.Second
 	testTimeout          = 5 * time.Minute
 )
@@ -89,7 +89,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c *client.Client) ([]string, error
 				return nil, err
 			}
 			for _, pod := range podList.Items {
-				expectedPods = append(expectedPods, pod.Name)
+				expectedPods = append(expectedPods, string(pod.UID))
 			}
 		}
 	}