From 1d90394bf67e4da6948e30b53e830d0d930f60f0 Mon Sep 17 00:00:00 2001 From: "Tim St. Clair" Date: Fri, 4 Mar 2016 10:37:00 -0800 Subject: [PATCH] Use the summary_api with heapster by default --- .../addons/cluster-monitoring/google/heapster-controller.yaml | 2 +- .../googleinfluxdb/heapster-controller-combined.yaml | 2 +- .../addons/cluster-monitoring/influxdb/heapster-controller.yaml | 2 +- .../cluster-monitoring/standalone/heapster-controller.yaml | 2 +- .../addons/cluster-monitoring/google/heapster-controller.yaml | 2 +- .../googleinfluxdb/heapster-controller-combined.yaml | 2 +- .../addons/cluster-monitoring/influxdb/heapster-controller.yaml | 2 +- .../cluster-monitoring/standalone/heapster-controller.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index d67ad439654..9c9bce9a8fe 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -38,7 +38,7 @@ spec: memory: {{ heapster_memory }} command: - /heapster - - --source=kubernetes:'' + - --source=kubernetes.summary_api:'' - --sink=gcm - --metric_resolution=60s volumeMounts: diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml index 4d57c3e5bed..946d59b11a5 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -38,7 +38,7 @@ spec: memory: {{ heapster_memory }} command: - /heapster - - --source=kubernetes:'' + - --source=kubernetes.summary_api:'' - --sink=influxdb:http://monitoring-influxdb:8086 - --sink=gcm:?metrics=autoscaling - --metric_resolution=60s diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml index 08d74a9df95..2f388485091 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -38,7 +38,7 @@ spec: memory: {{ heapster_memory }} command: - /heapster - - --source=kubernetes:'' + - --source=kubernetes.summary_api:'' - --sink=influxdb:http://monitoring-influxdb:8086 - --metric_resolution=60s - image: gcr.io/google_containers/heapster:v0.20.0-alpha11 diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml index 4525a5dcec0..67f5678bd56 100644 --- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml @@ -38,5 +38,5 @@ spec: memory: {{ heapster_memory }} command: - /heapster - - --source=kubernetes:'' + - --source=kubernetes.summary_api:'' - --metric_resolution=60s diff --git a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/google/heapster-controller.yaml index c8f903b0aae..9cfa934afed 100644 --- a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/google/heapster-controller.yaml @@ -28,7 +28,7 @@ spec: memory: 300Mi command: - /heapster - - --source=kubernetes:'' + - --source=kubernetes.summary_api:'' - --sink=gcm - --sink=gcmautoscaling - --sink=gcl diff --git a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml index c036fc92e61..322fc8029cd 100644 --- a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -28,7 +28,7 @@ spec: memory: 300Mi command: - /heapster - - --source=kubernetes:'' + - --source=kubernetes.summary_api:'' - --sink=gcl - --sink=gcmautoscaling - --sink=influxdb:http://monitoring-influxdb:8086 diff --git a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/heapster-controller.yaml index e6b71a10177..f9dfb24103c 100644 --- a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -28,7 +28,7 @@ spec: memory: 300Mi command: - /heapster - - --source=kubernetes:'' + - --source=kubernetes.summary_api:'' - --sink=influxdb:http://monitoring-influxdb:8086 - --stats_resolution=30s - --sink_frequency=1m diff --git a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/standalone/heapster-controller.yaml index ed53a9d9df5..ad7177ffe36 100644 --- a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/standalone/heapster-controller.yaml +++ b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/standalone/heapster-controller.yaml @@ -28,4 +28,4 @@ spec: memory: 300Mi command: - /heapster - - --source=kubernetes:'' + - --source=kubernetes.summary_api:''