diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index 1e8ac6884c6..8a4ea11aa60 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -46,7 +46,7 @@ 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. +# 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: Enable node logging. diff --git a/cluster/azure/config-default.sh b/cluster/azure/config-default.sh index 38b1f3e7d8b..7174d5ffebc 100644 --- a/cluster/azure/config-default.sh +++ b/cluster/azure/config-default.sh @@ -45,5 +45,8 @@ LOGGING_DESTINATION=elasticsearch # options: elasticsearch, gcp ENABLE_CLUSTER_LOGGING=false ELASTICSEARCH_LOGGING_REPLICAS=1 +# 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}" + # Admission Controllers to invoke prior to persisting objects in cluster ADMISSION_CONTROL=NamespaceAutoProvision,LimitRanger,ResourceQuota diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 326e53508ef..9fd8d63b4e9 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -86,7 +86,7 @@ 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. +# 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: Enable node logging. diff --git a/cluster/gke/config-default.sh b/cluster/gke/config-default.sh index f5932be809a..18ac412b619 100644 --- a/cluster/gke/config-default.sh +++ b/cluster/gke/config-default.sh @@ -29,3 +29,6 @@ LOGGING_DESTINATION=gcp # options: elasticsearch, gcp # Optional: When set to true, Elasticsearch and Kibana will be setup as part of the cluster bring up. ENABLE_CLUSTER_LOGGING=false ELASTICSEARCH_LOGGING_REPLICAS=1 + +# 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:-false}" diff --git a/cluster/rackspace/config-default.sh b/cluster/rackspace/config-default.sh index 57d84bb5067..9015083605e 100644 --- a/cluster/rackspace/config-default.sh +++ b/cluster/rackspace/config-default.sh @@ -49,6 +49,9 @@ LOGGING_DESTINATION=elasticsearch ENABLE_CLUSTER_LOGGING=false ELASTICSEARCH_LOGGING_REPLICAS=1 +# 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: Install cluster DNS. ENABLE_CLUSTER_DNS=true DNS_SERVER_IP="10.0.0.10" diff --git a/cluster/vagrant/config-default.sh b/cluster/vagrant/config-default.sh index cf2c5f84a3b..4427de1450d 100755 --- a/cluster/vagrant/config-default.sh +++ b/cluster/vagrant/config-default.sh @@ -62,6 +62,9 @@ LOGGING_DESTINATION=elasticsearch ENABLE_CLUSTER_LOGGING=false ELASTICSEARCH_LOGGING_REPLICAS=1 +# 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}" + # Extra options to set on the Docker command line. This is useful for setting # --insecure-registry for local registries. DOCKER_OPTS="" diff --git a/cluster/vsphere/config-default.sh b/cluster/vsphere/config-default.sh index 167bad5c45d..657673e2edd 100755 --- a/cluster/vsphere/config-default.sh +++ b/cluster/vsphere/config-default.sh @@ -44,6 +44,9 @@ LOGGING_DESTINATION=elasticsearch ENABLE_CLUSTER_LOGGING=false ELASTICSEARCH_LOGGING_REPLICAS=1 +# 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: Install cluster DNS. ENABLE_CLUSTER_DNS=true DNS_SERVER_IP="10.244.240.240"