Merge pull request #9886 from vishh/heapster_v0.14.1

Updating heapster version to v0.14.1.
This commit is contained in:
Saad Ali
2015-06-16 13:14:07 -07:00
8 changed files with 88 additions and 19 deletions

View File

@@ -58,6 +58,7 @@ ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}"
# influxdb - Heapster, InfluxDB, and Grafana
# google - Heapster, Google Cloud Monitoring, and Google Cloud Logging
# googleinfluxdb - Enable influxdb and google (except GCM)
# standalone - Heapster only. Metrics available via Heapster REST API.
ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-googleinfluxdb}"
# Optional: Enable node logging.