From 94080973b1dc3c649c48404590d2a7cebe77a07c Mon Sep 17 00:00:00 2001
From: Piotr Szczesniak <pszczesniak@google.com>
Date: Fri, 25 Sep 2015 16:31:01 +0200
Subject: [PATCH] Bumbed Heapster to v0.18.2 and changed its config

The new version fixes problem with missing metrics.
The new config decreases load on GCM/InfluxDB.

Increased stats resolution from default 5s to 30s.
Decreased sink frequency from 2m to 1m.
---
 .../google/heapster-controller.yaml                 | 13 +++++++------
 .../heapster-controller-combined.yaml               | 13 +++++++------
 .../influxdb/heapster-controller.yaml               | 12 +++++++-----
 .../standalone/heapster-controller.yaml             | 10 +++++-----
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index 20822d36872..1d0de829987 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v9
+  name: heapster-v10
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v9
+    version: v10
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v9
+    version: v10
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v9
+        version: v10
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.1
+        - image: gcr.io/google_containers/heapster:v0.18.2
           name: heapster
           resources:
             limits:
@@ -32,7 +32,8 @@ spec:
             - --sink=gcm
             - --sink=gcmautoscaling
             - --sink=gcl
-            - --sink_frequency=2m
+            - --stats_resolution=30s
+            - --sink_frequency=1m
           volumeMounts:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
index f70b84c83a9..ed6971ee969 100644
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v9
+  name: heapster-v10
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v9
+    version: v10
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v9
+    version: v10
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v9
+        version: v10
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.1
+        - image: gcr.io/google_containers/heapster:v0.18.2
           name: heapster
           resources:
             limits:
@@ -32,7 +32,8 @@ spec:
             - --sink=gcl
             - --sink=gcmautoscaling
             - --sink=influxdb:http://monitoring-influxdb:8086
-            - --sink_frequency=2m
+            - --stats_resolution=30s
+            - --sink_frequency=1m
           volumeMounts:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
index 06ad80799f2..e6b71a10177 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v9
+  name: heapster-v10
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v9
+    version: v10
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v9
+    version: v10
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v9
+        version: v10
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.1
+        - image: gcr.io/google_containers/heapster:v0.18.2
           name: heapster
           resources:
             limits:
@@ -30,3 +30,5 @@ spec:
             - /heapster
             - --source=kubernetes:''
             - --sink=influxdb:http://monitoring-influxdb:8086
+            - --stats_resolution=30s
+            - --sink_frequency=1m
diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
index 6c8434b37cb..ed53a9d9df5 100644
--- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v9
+  name: heapster-v10
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v9
+    version: v10
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v9
+    version: v10
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v9
+        version: v10
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.1
+        - image: gcr.io/google_containers/heapster:v0.18.2
           name: heapster
           resources:
             limits: