standard config opt names: node monitoring

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

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

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"

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

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

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

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"

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

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
 
 

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 %}

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

cluster/vagrant/provision-master.sh

@@ -82,6 +82,7 @@ mkdir -p /srv/salt-overlay/pillar
 cat <<EOF >/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

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

cluster/vsphere/templates/create-dynamic-salt-files.sh

@@ -22,6 +22,7 @@ mkdir -p /srv/salt-overlay/pillar
 cat <<EOF >/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

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}'"