diff --git a/cluster/azure/config-default.sh b/cluster/azure/config-default.sh index 2039ae84829..c8d35ce4472 100644 --- a/cluster/azure/config-default.sh +++ b/cluster/azure/config-default.sh @@ -45,8 +45,11 @@ 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}" +# Optional: Cluster monitoring to setup as part of the cluster bring up: +# none - No cluster monitoring setup +# influxdb - Heapster, InfluxDB, and Grafana +# google - Heapster, Google Cloud Monitoring, and Google Cloud Logging +ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}" # Admission Controllers to invoke prior to persisting objects in cluster ADMISSION_CONTROL=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota diff --git a/cluster/gke/config-default.sh b/cluster/gke/config-default.sh index da741b34220..27a6249d442 100644 --- a/cluster/gke/config-default.sh +++ b/cluster/gke/config-default.sh @@ -30,5 +30,8 @@ LOGGING_DESTINATION=gcp # 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:-false}" +# Optional: Cluster monitoring to setup as part of the cluster bring up: +# none - No cluster monitoring setup +# influxdb - Heapster, InfluxDB, and Grafana +# google - Heapster, Google Cloud Monitoring, and Google Cloud Logging +ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-none}" diff --git a/cluster/rackspace/config-default.sh b/cluster/rackspace/config-default.sh index ce1e07fac60..57c1de01bf5 100644 --- a/cluster/rackspace/config-default.sh +++ b/cluster/rackspace/config-default.sh @@ -49,8 +49,11 @@ 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: Cluster monitoring to setup as part of the cluster bring up: +# none - No cluster monitoring setup +# influxdb - Heapster, InfluxDB, and Grafana +# google - Heapster, Google Cloud Monitoring, and Google Cloud Logging +ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}" # Optional: Install cluster DNS. ENABLE_CLUSTER_DNS=true diff --git a/cluster/vagrant/config-default.sh b/cluster/vagrant/config-default.sh index 7ab47df5e60..967f41bc2b8 100755 --- a/cluster/vagrant/config-default.sh +++ b/cluster/vagrant/config-default.sh @@ -63,8 +63,11 @@ 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: Cluster monitoring to setup as part of the cluster bring up: +# none - No cluster monitoring setup +# influxdb - Heapster, InfluxDB, and Grafana +# google - Heapster, Google Cloud Monitoring, and Google Cloud Logging +ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}" # Extra options to set on the Docker command line. This is useful for setting # --insecure-registry for local registries. diff --git a/cluster/vsphere/config-default.sh b/cluster/vsphere/config-default.sh index 1ece58e31f9..67ca7a84968 100755 --- a/cluster/vsphere/config-default.sh +++ b/cluster/vsphere/config-default.sh @@ -44,8 +44,11 @@ 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: Cluster monitoring to setup as part of the cluster bring up: +# none - No cluster monitoring setup +# influxdb - Heapster, InfluxDB, and Grafana +# google - Heapster, Google Cloud Monitoring, and Google Cloud Logging +ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}" # Optional: Install cluster DNS. ENABLE_CLUSTER_DNS=true