Upgraded heapster to v0.18.1, influxDB to v0.8.9, and Grafana to v2.0.

cluster/addons/cluster-monitoring/README.md

@@ -1,6 +1,11 @@
-# Heapster
+# Kubernetes Monitoring
 
-Heapster enables monitoring of Kubernetes Clusters using [cAdvisor](https://github.com/google/cadvisor). The kubelet will communicate with an instance of cAdvisor running on localhost and proxy container stats to Heapster. Kubelet will attempt to connect to cAdvisor on port 4194 by default but this port can be configured with kubelet's `--cadvisor-port` run flag. Detailed information about heapster can be found [here](https://github.com/GoogleCloudPlatform/heapster).
+[Heapster](https://github.com/GoogleCloudPlatform/heapster) enables monitoring and performance analysis in Kubernetes Clusters.
+Heapster collects signals from kubelets and the api server, processes them, and exports them via REST APIs or to a configurable timeseries storage backend.
+
+Use [Kubedash](https://github.com/kubernetes/kubedash) to visualize Heapster metrics. </br>
+
+*Note: Kubedash is an experimental feature*
 
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/cluster-monitoring/README.md?pixel)]()

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

@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: monitoring-heapster-v8
+  name: heapster-v9
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v8
+    version: v9
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v8
+    version: v9
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v8
+        version: v9
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.17.0
+        - image: gcr.io/google_containers/heapster:v0.18.1
           name: heapster
           resources:
             limits:
@@ -32,8 +32,7 @@ spec:
             - --sink=gcm
             - --sink=gcmautoscaling
             - --sink=gcl
-            - --poll_duration=2m
+            - --sink_frequency=2m
-            - --stats_resolution=1m
           volumeMounts:
             - name: ssl-certs
               mountPath: /etc/ssl/certs

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

@@ -1,7 +1,7 @@
 kind: Service
 apiVersion: v1
 metadata: 
-  name: monitoring-heapster
+  name: heapster
   namespace: kube-system
   labels: 
     kubernetes.io/cluster-service: "true"

cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml

@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: monitoring-heapster-v8
+  name: heapster-v9
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v8
+    version: v9
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v8
+    version: v9
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v8
+        version: v9
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.17.0
+        - image: gcr.io/google_containers/heapster:v0.18.1
           name: heapster
           resources:
             limits:
@@ -32,8 +32,7 @@ spec:
             - --sink=gcl
             - --sink=gcmautoscaling
             - --sink=influxdb:http://monitoring-influxdb:8086
-            - --poll_duration=2m
+            - --sink_frequency=2m
-            - --stats_resolution=1m
           volumeMounts:
             - name: ssl-certs
               mountPath: /etc/ssl/certs

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

@@ -6,10 +6,11 @@ metadata:
   labels: 
     kubernetes.io/cluster-service: "true"
     kubernetes.io/name: "Grafana"
-spec: 
+spec:
+  type: LoadBalancer
   ports: 
     - port: 80
-      targetPort: 8080
+      targetPort: 3000
   selector: 
     k8s-app: influxGrafana
 

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

@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: monitoring-heapster-v8
+  name: heapster-v9
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v8
+    version: v9
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v8
+    version: v9
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v8
+        version: v9
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.17.0
+        - image: gcr.io/google_containers/heapster:v0.18.1
           name: heapster
           resources:
             limits:

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

@@ -1,7 +1,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: monitoring-heapster
+  name: heapster
   namespace: kube-system
   labels:
     kubernetes.io/cluster-service: "true"

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

@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: monitoring-influx-grafana-v1
+  name: monitoring-influxdb-grafana-v2
   namespace: kube-system
   labels: 
     k8s-app: influxGrafana
-    version: v1
+    version: v2
     kubernetes.io/cluster-service: "true"
 spec: 
   replicas: 1
   selector: 
     k8s-app: influxGrafana
-    version: v1
+    version: v2
   template: 
     metadata: 
       labels: 
         k8s-app: influxGrafana
-        version: v1
+        version: v2
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 
-        - image: gcr.io/google_containers/heapster_influxdb:v0.3
+        - image: gcr.io/google_containers/heapster_influxdb:v0.4
           name: influxdb
           resources:
             limits:
@@ -34,19 +34,12 @@ spec:
           volumeMounts:
           - name: influxdb-persistent-storage
             mountPath: /data
-        - image: gcr.io/google_containers/heapster_grafana:v0.7
+        - image: grafana/grafana:2.1.0
           name: grafana
           resources:
             limits:
               cpu: 100m
               memory: 100Mi
-          env: 
-            - name: INFLUXDB_EXTERNAL_URL
-              value: /api/v1/proxy/namespaces/kube-system/services/monitoring-influxdb:api/db/
-            - name: INFLUXDB_HOST
-              value: monitoring-influxdb
-            - name: INFLUXDB_PORT
-              value: "8086"
       volumes:
       - name: influxdb-persistent-storage
         emptyDir: {}

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

@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: monitoring-heapster-v8
+  name: heapster-v9
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v8
+    version: v9
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v8
+    version: v9
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v8
+        version: v9
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.17.0
+        - image: gcr.io/google_containers/heapster:v0.18.1
           name: heapster
           resources:
             limits:

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

@@ -1,7 +1,7 @@
 kind: Service
 apiVersion: v1
 metadata: 
-  name: monitoring-heapster
+  name: heapster
   namespace: kube-system
   labels: 
     kubernetes.io/cluster-service: "true"