From 635b6bc097ae0ddb4e21998a7955129772b3f122 Mon Sep 17 00:00:00 2001 From: Manfred Geiler Date: Fri, 29 May 2015 11:15:21 +0200 Subject: [PATCH 1/2] aws: fix cluster monitoring (new option "influxdb" instead of "true") --- cluster/aws/config-default.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index cdec7ea8aaf..2e67beeeace 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -54,8 +54,10 @@ ENABLE_DOCKER_REGISTRY_CACHE=true # Optional: Install node monitoring. ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}" -# Optional: When set to true, heapster, Influxdb and Grafana will be setup as part of the cluster bring up. -ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-true}" +# Optional: Cluster monitoring to setup as part of the cluster bring up: +# none - No cluster monitoring setup +# influxdb - Heapster, InfluxDB, and Grafana +ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}" # Optional: Enable node logging. ENABLE_NODE_LOGGING="${KUBE_ENABLE_NODE_LOGGING:-true}" From 8c8f8feb62547f4bb4e8fd7feacc51f7e4ba09d9 Mon Sep 17 00:00:00 2001 From: Manfred Geiler Date: Mon, 1 Jun 2015 09:12:41 +0200 Subject: [PATCH 2/2] aws: fix cluster monitoring ("none" instead of "false") --- cluster/aws/config-test.sh | 6 ++++-- cluster/aws/util.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index 5b5506aed05..b94f5255420 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -51,8 +51,10 @@ ENABLE_DOCKER_REGISTRY_CACHE=true # Optional: Install node monitoring. ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}" -# Optional: When set to true, heapster will be setup as part of the cluster bring up. -ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-false}" +# Optional: Cluster monitoring to setup as part of the cluster bring up: +# none - No cluster monitoring setup +# influxdb - Heapster, InfluxDB, and Grafana +ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-none}" # Optional: Enable node logging. ENABLE_NODE_LOGGING="${KUBE_ENABLE_NODE_LOGGING:-true}" diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index 96a00c24f14..cde99eb2635 100644 --- a/cluster/aws/util.sh +++ b/cluster/aws/util.sh @@ -508,7 +508,7 @@ function kube-up { echo "readonly KUBE_USER='${KUBE_USER}'" echo "readonly KUBE_PASSWORD='${KUBE_PASSWORD}'" echo "readonly SERVICE_CLUSTER_IP_RANGE='${SERVICE_CLUSTER_IP_RANGE}'" - echo "readonly ENABLE_CLUSTER_MONITORING='${ENABLE_CLUSTER_MONITORING:-false}'" + echo "readonly ENABLE_CLUSTER_MONITORING='${ENABLE_CLUSTER_MONITORING:-none}'" echo "readonly ENABLE_NODE_MONITORING='${ENABLE_NODE_MONITORING:-false}'" echo "readonly ENABLE_CLUSTER_LOGGING='${ENABLE_CLUSTER_LOGGING:-false}'" echo "readonly ENABLE_NODE_LOGGING='${ENABLE_NODE_LOGGING:-false}'"