standard config opt names: cluster monitoring

This commit is contained in:
Tim Hockin 2014-11-13 20:18:03 -08:00
parent e359ad5902
commit fad806d1d1
4 changed files with 10 additions and 7 deletions

View File

@ -106,14 +106,14 @@ function ensure-temp-dir {
}
function setup-monitoring {
if [ ${MONITORING-} ]; then
if [[ "${ENABLE_CLUSTER_MONITORING}" == "true" ]]; then
# TODO: Implement this.
echo "Monitoring not currently supported on AWS"
fi
}
function teardown-monitoring {
if [ ${MONITORING-} ]; then
if [[ "${ENABLE_CLUSTER_MONITORING}" == "true" ]]; then
# TODO: Implement this.
echo "Monitoring not currently supported on AWS"
fi

View File

@ -35,8 +35,10 @@ MINION_SCOPES=("storage-ro" "compute-rw")
# Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default.
POLL_SLEEP_INTERVAL=3
PORTAL_NET="10.0.0.0/16"
# When set to true, heapster will be setup as part of the cluster bring up.
MONITORING=true
# Optional: When set to true, heapster will be setup as part of the cluster bring up.
ENABLE_CLUSTER_MONITORING=true
# Turn on Elasticsearch logging unless Google Cloud Logging has been selected or
# if Elasticsearch logging has been specifically turned off.
if [[ "${FLUENTD_GCP-}" != "true" ]]; then

View File

@ -35,7 +35,8 @@ MINION_SCOPES=("storage-ro" "compute-rw")
# Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default.
POLL_SLEEP_INTERVAL=3
PORTAL_NET="10.0.0.0/16"
MONITORING=false
# When set to true, Docker Cache is enabled by default as part of the cluster bring up.
ENABLE_DOCKER_REGISTRY_CACHE=true
ENABLE_CLUSTER_MONITORING=false

View File

@ -566,7 +566,7 @@ function restart-kube-proxy {
# Setup monitoring using heapster and InfluxDB
function setup-monitoring {
if [[ "${MONITORING}" == "true" ]]; then
if [[ "${ENABLE_CLUSTER_MONITORING}" == "true" ]]; then
echo "Setting up cluster monitoring using Heapster."
if ! gcloud compute firewall-rules describe monitoring-heapster &>/dev/null; then
@ -604,7 +604,7 @@ function setup-monitoring {
}
function teardown-monitoring {
if [[ "${MONITORING}" == "true" ]]; then
if [[ "${ENABLE_CLUSTER_MONITORING}" == "true" ]]; then
detect-project
local kubectl="${KUBE_ROOT}/cluster/kubectl.sh"