From c21aeacc36c811054236dc60e37986326c604bd5 Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Tue, 10 Apr 2018 11:22:00 +0200 Subject: [PATCH] Remove InfluxDB from default cluster monitoring --- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 2 +- hack/ginkgo-e2e.sh | 2 +- test/e2e/framework/test_context.go | 2 +- test/e2e/instrumentation/monitoring/influxdb.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 5bdc4745a3895..6f0d3bc31d215 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -142,7 +142,7 @@ ENABLE_L7_LOADBALANCING="${KUBE_ENABLE_L7_LOADBALANCING:-glbc}" # stackdriver - Heapster, Google Cloud Monitoring (schema container), 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:-influxdb}" +ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-standalone}" # Optional: Enable deploying separate prometheus stack for monitoring kubernetes cluster ENABLE_PROMETHEUS_MONITORING="${KUBE_ENABLE_PROMETHEUS_MONITORING:-false}" diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index a3e586876c0ca..2815d5728170b 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -144,7 +144,7 @@ ENABLE_L7_LOADBALANCING="${KUBE_ENABLE_L7_LOADBALANCING:-glbc}" # stackdriver - Heapster, Google Cloud Monitoring (schema container), 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:-influxdb}" +ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-standalone}" # Optional: Enable deploying separate prometheus stack for monitoring kubernetes cluster ENABLE_PROMETHEUS_MONITORING="${KUBE_ENABLE_PROMETHEUS_MONITORING:-false}" diff --git a/hack/ginkgo-e2e.sh b/hack/ginkgo-e2e.sh index 8472115da2b0a..e4a2863f79977 100755 --- a/hack/ginkgo-e2e.sh +++ b/hack/ginkgo-e2e.sh @@ -159,7 +159,7 @@ export PATH=$(dirname "${e2e_test}"):"${PATH}" --network="${KUBE_GCE_NETWORK:-${KUBE_GKE_NETWORK:-e2e}}" \ --node-tag="${NODE_TAG:-}" \ --master-tag="${MASTER_TAG:-}" \ - --cluster-monitoring-mode="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}" \ + --cluster-monitoring-mode="${KUBE_ENABLE_CLUSTER_MONITORING:-standalone}" \ --prometheus-monitoring="${KUBE_ENABLE_PROMETHEUS_MONITORING:-false}" \ ${KUBE_CONTAINER_RUNTIME:+"--container-runtime=${KUBE_CONTAINER_RUNTIME}"} \ ${MASTER_OS_DISTRIBUTION:+"--master-os-distro=${MASTER_OS_DISTRIBUTION}"} \ diff --git a/test/e2e/framework/test_context.go b/test/e2e/framework/test_context.go index c13e8e769f071..32a48bd409ace 100644 --- a/test/e2e/framework/test_context.go +++ b/test/e2e/framework/test_context.go @@ -238,7 +238,7 @@ func RegisterClusterFlags() { flag.StringVar(&TestContext.Prefix, "prefix", "e2e", "A prefix to be added to cloud resources created during testing.") flag.StringVar(&TestContext.MasterOSDistro, "master-os-distro", "debian", "The OS distribution of cluster master (debian, trusty, or coreos).") flag.StringVar(&TestContext.NodeOSDistro, "node-os-distro", "debian", "The OS distribution of cluster VM instances (debian, trusty, or coreos).") - flag.StringVar(&TestContext.ClusterMonitoringMode, "cluster-monitoring-mode", "influxdb", "The monitoring solution that is used in the cluster.") + flag.StringVar(&TestContext.ClusterMonitoringMode, "cluster-monitoring-mode", "standalone", "The monitoring solution that is used in the cluster.") flag.BoolVar(&TestContext.EnablePrometheusMonitoring, "prometheus-monitoring", false, "Separate Prometheus monitoring deployed in cluster.") // TODO: Flags per provider? Rename gce-project/gce-zone? diff --git a/test/e2e/instrumentation/monitoring/influxdb.go b/test/e2e/instrumentation/monitoring/influxdb.go index 5434a9c3970a5..64ef4002db087 100644 --- a/test/e2e/instrumentation/monitoring/influxdb.go +++ b/test/e2e/instrumentation/monitoring/influxdb.go @@ -42,7 +42,7 @@ var _ = instrumentation.SIGDescribe("Monitoring", func() { framework.SkipUnlessClusterMonitoringModeIs("influxdb") }) - It("should verify monitoring pods and all cluster nodes are available on influxdb using heapster.", func() { + It("should verify monitoring pods and all cluster nodes are available on influxdb using heapster [Feature:InfluxdbMonitoring]", func() { testMonitoringUsingHeapsterInfluxdb(f.ClientSet) }) })