Merge pull request #9615 from vishh/heapster_v0.14.0

Update to heapster v0.14.0
2015-06-11 15:14:34 -07:00
parent 82aa8f9984 a38204a498
commit 0e3633d404
8 changed files with 43 additions and 17 deletions
--- a/test/e2e/monitoring.go
+++ b/test/e2e/monitoring.go
@@ -56,8 +56,8 @@ const (
 	influxdbDatabaseName = "k8s"
 	influxdbUser         = "root"
 	influxdbPW           = "root"
-	podlistQuery         = "select distinct(pod_id) from /cpu.*/"
-	nodelistQuery        = "select distinct(hostname) from /cpu.*/"
+	podlistQuery         = "select distinct(pod_id) from \"cpu/usage_ns_cumulative\""
+	nodelistQuery        = "select distinct(hostname) from \"cpu/usage_ns_cumulative\""
 	sleepBetweenAttempts = 5 * time.Second
 	testTimeout          = 5 * time.Minute
 )