From 52ad94d766ffd237529fc372736d95fb16f627ea Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Thu, 13 Nov 2014 20:32:35 -0800 Subject: [PATCH] standard config opt names: node monitoring --- cluster/aws/config-default.sh | 3 +++ cluster/aws/templates/create-dynamic-salt-files.sh | 1 + cluster/aws/util.sh | 1 + cluster/gce/config-default.sh | 4 ++++ cluster/gce/config-test.sh | 2 ++ cluster/gce/templates/create-dynamic-salt-files.sh | 1 + cluster/gce/util.sh | 1 + cluster/rackspace/config-default.sh | 3 +++ cluster/rackspace/util.sh | 1 + cluster/saltbase/salt/top.sls | 2 ++ cluster/vagrant/config-default.sh | 3 +++ cluster/vagrant/provision-master.sh | 1 + cluster/vsphere/config-default.sh | 3 +++ cluster/vsphere/templates/create-dynamic-salt-files.sh | 1 + cluster/vsphere/util.sh | 1 + 15 files changed, 28 insertions(+) diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index fb395da1bba..a1e05c16394 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -35,3 +35,6 @@ MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24")) MINION_SCOPES="" POLL_SLEEP_INTERVAL=3 PORTAL_NET="10.0.0.0/16" + +# Optional: Install node monitoring. +ENABLE_NODE_MONITORING=true diff --git a/cluster/aws/templates/create-dynamic-salt-files.sh b/cluster/aws/templates/create-dynamic-salt-files.sh index 0183e286007..e6092630e1a 100644 --- a/cluster/aws/templates/create-dynamic-salt-files.sh +++ b/cluster/aws/templates/create-dynamic-salt-files.sh @@ -24,6 +24,7 @@ node_instance_prefix: $NODE_INSTANCE_PREFIX portal_net: $PORTAL_NET use-fluentd-es: $FLUENTD_ELASTICSEARCH use-fluentd-gcp: $FLUENTD_GCP +enable_node_monitoring: $ENABLE_NODE_MONITORING EOF mkdir -p /srv/salt-overlay/salt/nginx diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index 777310c6243..cf25daee6ab 100644 --- a/cluster/aws/util.sh +++ b/cluster/aws/util.sh @@ -255,6 +255,7 @@ function kube-up { echo "readonly AWS_ZONE='${ZONE}'" echo "readonly MASTER_HTPASSWD='${htpasswd}'" echo "readonly PORTAL_NET='${PORTAL_NET}'" + echo "readonly ENABLE_NODE_MONITORING='${ENABLE_NODE_MONITORING:-false}'" echo "readonly FLUENTD_ELASTICSEARCH='${FLUENTD_ELASTICSEARCH:-false}'" echo "readonly FLUENTD_GCP='false'" grep -v "^#" "${KUBE_ROOT}/cluster/aws/templates/create-dynamic-salt-files.sh" diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 45d741874d0..d1a69b4a833 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -36,6 +36,9 @@ MINION_SCOPES=("storage-ro" "compute-rw") POLL_SLEEP_INTERVAL=3 PORTAL_NET="10.0.0.0/16" +# Optional: Install node monitoring. +ENABLE_NODE_MONITORING=true + # Optional: When set to true, heapster will be setup as part of the cluster bring up. ENABLE_CLUSTER_MONITORING=true @@ -46,5 +49,6 @@ if [[ "${FLUENTD_GCP-}" != "true" ]]; then FLUENTD_ELASTICSEARCH="true" fi fi + # When set to true, Docker Cache is enabled by default as part of the cluster bring up. ENABLE_DOCKER_REGISTRY_CACHE=true diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 3e4469e2e39..c4b8adea329 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -39,4 +39,6 @@ PORTAL_NET="10.0.0.0/16" # When set to true, Docker Cache is enabled by default as part of the cluster bring up. ENABLE_DOCKER_REGISTRY_CACHE=true +ENABLE_NODE_MONITORING=true + ENABLE_CLUSTER_MONITORING=false diff --git a/cluster/gce/templates/create-dynamic-salt-files.sh b/cluster/gce/templates/create-dynamic-salt-files.sh index c02ff5d7e63..592689b4f1a 100644 --- a/cluster/gce/templates/create-dynamic-salt-files.sh +++ b/cluster/gce/templates/create-dynamic-salt-files.sh @@ -24,6 +24,7 @@ node_instance_prefix: $NODE_INSTANCE_PREFIX portal_net: $PORTAL_NET use-fluentd-es: $FLUENTD_ELASTICSEARCH use-fluentd-gcp: $FLUENTD_GCP +enable_node_monitoring: $ENABLE_NODE_MONITORING EOF mkdir -p /srv/salt-overlay/salt/nginx diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 3328cc61969..fb2d0c81b07 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -285,6 +285,7 @@ function kube-up { echo "readonly PORTAL_NET='${PORTAL_NET}'" echo "readonly FLUENTD_ELASTICSEARCH='${FLUENTD_ELASTICSEARCH:-false}'" echo "readonly FLUENTD_GCP='${FLUENTD_GCP:-false}'" + echo "readonly ENABLE_NODE_MONITORING='${ENABLE_NODE_MONITORING:-false}'" grep -v "^#" "${KUBE_ROOT}/cluster/gce/templates/common.sh" grep -v "^#" "${KUBE_ROOT}/cluster/gce/templates/create-dynamic-salt-files.sh" grep -v "^#" "${KUBE_ROOT}/cluster/gce/templates/download-release.sh" diff --git a/cluster/rackspace/config-default.sh b/cluster/rackspace/config-default.sh index 7fb84a37a46..5013634396e 100644 --- a/cluster/rackspace/config-default.sh +++ b/cluster/rackspace/config-default.sh @@ -37,3 +37,6 @@ MINION_TAG="tags=${INSTANCE_PREFIX}-minion" MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${RAX_NUM_MINIONS}})) KUBE_NETWORK=($(eval echo "10.240.{1..${RAX_NUM_MINIONS}}.0/24")) PORTAL_NET="10.0.0.0/16" + +# Optional: Install node monitoring. +ENABLE_NODE_MONITORING=true diff --git a/cluster/rackspace/util.sh b/cluster/rackspace/util.sh index ae32a4db6e2..a0a7e0b1a1c 100644 --- a/cluster/rackspace/util.sh +++ b/cluster/rackspace/util.sh @@ -184,6 +184,7 @@ rax-boot-minions() { sed -e "s|DISCOVERY_ID|${DISCOVERY_ID}|" \ -e "s|INDEX|$((i + 1))|g" \ -e "s|CLOUD_FILES_URL|${RELEASE_TMP_URL//&/\&}|" \ + -e "s|ENABLE_NODE_MONITORING|${ENABLE_NODE_MONITORING:-false}|" \ $(dirname $0)/rackspace/cloud-config/minion-cloud-config.yaml > $KUBE_TEMP/minion-cloud-config-$(($i + 1)).yaml diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls index d817b5d2c78..7b631d53126 100644 --- a/cluster/saltbase/salt/top.sls +++ b/cluster/saltbase/salt/top.sls @@ -8,7 +8,9 @@ base: - docker - kubelet - kube-proxy +{% if pillar['enable_node_monitoring'] is defined and pillar['enable_node_monitoring'] %} - cadvisor +{% endif %} {% if pillar['use-fluentd-es'] is defined and pillar['use-fluentd-es'] %} - fluentd-es {% endif %} diff --git a/cluster/vagrant/config-default.sh b/cluster/vagrant/config-default.sh index 79171655fe6..8c625b80c8b 100755 --- a/cluster/vagrant/config-default.sh +++ b/cluster/vagrant/config-default.sh @@ -37,3 +37,6 @@ for ((i=0; i < NUM_MINIONS; i++)) do MINION_NAMES[$i]="${MINION_IP[$i]}" VAGRANT_MINION_NAMES[$i]="minion-$[$i+1]" done + +# Optional: Install node monitoring. +ENABLE_NODE_MONITORING=true diff --git a/cluster/vagrant/provision-master.sh b/cluster/vagrant/provision-master.sh index c4605e799ff..13188a676aa 100755 --- a/cluster/vagrant/provision-master.sh +++ b/cluster/vagrant/provision-master.sh @@ -82,6 +82,7 @@ mkdir -p /srv/salt-overlay/pillar cat </srv/salt-overlay/pillar/cluster-params.sls portal_net: $PORTAL_NET cert_ip: $MASTER_IP + enable_node_monitoring: $ENABLE_NODE_MONITORING EOF # Configure the salt-master diff --git a/cluster/vsphere/config-default.sh b/cluster/vsphere/config-default.sh index e8d9a637c9e..65ad26895d1 100755 --- a/cluster/vsphere/config-default.sh +++ b/cluster/vsphere/config-default.sh @@ -32,3 +32,6 @@ MINION_MEMORY_MB=2048 MINION_CPU=1 PORTAL_NET="10.244.240.0/20" + +# Optional: Install node monitoring. +ENABLE_NODE_MONITORING=true diff --git a/cluster/vsphere/templates/create-dynamic-salt-files.sh b/cluster/vsphere/templates/create-dynamic-salt-files.sh index afea82b88c8..7fe7e6b6e8d 100755 --- a/cluster/vsphere/templates/create-dynamic-salt-files.sh +++ b/cluster/vsphere/templates/create-dynamic-salt-files.sh @@ -22,6 +22,7 @@ mkdir -p /srv/salt-overlay/pillar cat </srv/salt-overlay/pillar/cluster-params.sls node_instance_prefix: $NODE_INSTANCE_PREFIX portal_net: $PORTAL_NET +enable_node_monitoring: $ENABLE_NODE_MONITORING EOF mkdir -p /srv/salt-overlay/salt/nginx diff --git a/cluster/vsphere/util.sh b/cluster/vsphere/util.sh index e665d559dcf..274aee8afa6 100755 --- a/cluster/vsphere/util.sh +++ b/cluster/vsphere/util.sh @@ -291,6 +291,7 @@ function kube-up { echo "readonly MASTER_NAME='${MASTER_NAME}'" echo "readonly NODE_INSTANCE_PREFIX='${INSTANCE_PREFIX}-minion'" echo "readonly PORTAL_NET='${PORTAL_NET}'" + echo "readonly ENABLE_NODE_MONITORING='${ENABLE_NODE_MONITORING:-false}'" echo "readonly SERVER_BINARY_TAR='${SERVER_BINARY_TAR##*/}'" echo "readonly SALT_TAR='${SALT_TAR##*/}'" echo "readonly MASTER_HTPASSWD='${htpasswd}'"