From a839f47d4a782669d20561a52144eade835a38e5 Mon Sep 17 00:00:00 2001 From: saadali Date: Fri, 5 Jun 2015 17:54:06 -0700 Subject: [PATCH] Disable GCM for GCE --- .../googleinfluxdb/heapster-controller-combined.yaml | 1 - cluster/gce/config-default.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml index c416f8c3023..ca1e3acf0bb 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -25,7 +25,6 @@ spec: command: - /heapster - --source=kubernetes:https://kubernetes - - --sink=gcm - --sink=gcl - --sink=influxdb:http://monitoring-influxdb:8086 - --poll_duration=2m diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 4ec7167ce30..a4b4459db21 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -57,7 +57,7 @@ ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}" # none - No cluster monitoring setup # influxdb - Heapster, InfluxDB, and Grafana # google - Heapster, Google Cloud Monitoring, and Google Cloud Logging -# googleinfluxdb - Enable influxdb and google +# googleinfluxdb - Enable influxdb and google (except GCM) ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-googleinfluxdb}" # Optional: Enable node logging.