Merge pull request #9615 from vishh/heapster_v0.14.0

cluster/addons/cluster-monitoring/google/heapster-controller.yaml

-apiVersion: v1beta3
+apiVersion: v1
 kind: ReplicationController
 metadata: 
-  name: monitoring-heapster-v1
+  name: monitoring-heapster-v2
   namespace: default
   labels: 
     k8s-app: heapster
-    version: v1
+    version: v2
     kubernetes.io/cluster-service: "true"
 spec: 
   replicas: 1
   selector: 
     k8s-app: heapster
-    version: v1
+    version: v2
   template: 
     metadata: 
       labels: 
         k8s-app: heapster
-        version: v1
+        version: v2
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 
-        - image: gcr.io/google_containers/heapster:v0.13.0
+        - image: gcr.io/google_containers/heapster:v0.14.0
           name: heapster
           command:
             - /heapster

cluster/addons/cluster-monitoring/google/heapster-service.yaml

+kind: Service
+apiVersion: v1
+metadata: 
+  name: monitoring-heapster
+  labels: 
+    kubernetes.io/cluster-service: "true"
+    name: monitoring-heapster
+spec: 
+  ports: 
+    - port: 80
+      targetPort: 8082
+  selector: 
+    k8s-app: heapster

cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml

-apiVersion: v1beta3
+apiVersion: v1
 kind: Service
 metadata:
   name: monitoring-grafana

cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml

-apiVersion: v1beta3
+apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: monitoring-heapster-v1
+  name: monitoring-heapster-v2
   namespace: default 
   labels: 
     k8s-app: heapster
-    version: v1
+    version: v2
     kubernetes.io/cluster-service: "true"
 spec: 
   replicas: 1
   selector: 
     k8s-app: heapster
-    version: v1
+    version: v2
   template: 
     metadata: 
       labels: 
         k8s-app: heapster
-        version: v1
+        version: v2
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 
-        - image: gcr.io/google_containers/heapster:v0.13.0
+        - image: gcr.io/google_containers/heapster:v0.14.0
           name: heapster
           command:
             - /heapster

cluster/addons/cluster-monitoring/influxdb/heapster-service.yaml

+kind: Service
+apiVersion: v1
+metadata: 
+  name: monitoring-heapster
+  labels: 
+    kubernetes.io/cluster-service: "true"
+    name: monitoring-heapster
+spec: 
+  ports: 
+    - port: 80
+      targetPort: 8082
+  selector: 
+    k8s-app: heapster

cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml

-apiVersion: v1beta3
+apiVersion: v1
 kind: ReplicationController
 metadata:
   name: monitoring-influx-grafana-v1

cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml

-apiVersion: v1beta3
+apiVersion: v1
 kind: Service
 metadata:
   name: monitoring-influxdb

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
 )