From bd0084280015fe8bde2bd9d2394c17d329109f90 Mon Sep 17 00:00:00 2001 From: Michael Marshall Date: Wed, 19 Oct 2022 20:50:31 -0700 Subject: [PATCH] Fix monitoring configuration broken by #299 (#313) Related to #311 ### Motivation In #299, I updated the values without also updating the test values. As a result, I unintentionally enabled the monitoring stack in the tests and broke some examples. Because we are deploying all resources to a single node. It is possible that we are resource constrained, so I am going to re-disable the monitoring stack. ### Modifications * Update test cluster configurations to re-disable deploying the monitoring stack * Update examples with the new configuration ### Verifying this change - [ ] Make sure that the change passes the CI checks. --- .ci/clusters/values-bk-tls.yaml | 8 ++------ .ci/clusters/values-broker-tls.yaml | 8 ++------ .ci/clusters/values-function.yaml | 8 ++------ .ci/clusters/values-jwt-asymmetric.yaml | 8 ++------ .ci/clusters/values-jwt-symmetric.yaml | 8 ++------ .ci/clusters/values-local-pv.yaml | 8 ++------ .ci/clusters/values-pulsar-image.yaml | 7 ++----- .ci/clusters/values-tls.yaml | 8 ++------ .ci/clusters/values-zk-tls.yaml | 8 ++------ .ci/clusters/values-zkbk-tls.yaml | 8 ++------ examples/values-bookkeeper-aws.yaml | 12 +++--------- examples/values-cs.yaml | 10 +++------- examples/values-local-cluster.yaml | 9 ++------- examples/values-zookeeper-aws.yaml | 10 +++------- 14 files changed, 31 insertions(+), 89 deletions(-) diff --git a/.ci/clusters/values-bk-tls.yaml b/.ci/clusters/values-bk-tls.yaml index 241782f..8a7dcb8 100644 --- a/.ci/clusters/values-bk-tls.yaml +++ b/.ci/clusters/values-bk-tls.yaml @@ -17,12 +17,8 @@ # under the License. # -monitoring: - prometheus: false - grafana: false - node_exporter: false - alert_manager: false - +kube-prometheus-stack: + enabled: false # disabled AntiAffinity affinity: diff --git a/.ci/clusters/values-broker-tls.yaml b/.ci/clusters/values-broker-tls.yaml index 5192900..7813e61 100644 --- a/.ci/clusters/values-broker-tls.yaml +++ b/.ci/clusters/values-broker-tls.yaml @@ -17,12 +17,8 @@ # under the License. # -monitoring: - prometheus: false - grafana: false - node_exporter: false - alert_manager: false - +kube-prometheus-stack: + enabled: false # disabled AntiAffinity affinity: diff --git a/.ci/clusters/values-function.yaml b/.ci/clusters/values-function.yaml index efc99fc..f9df1af 100644 --- a/.ci/clusters/values-function.yaml +++ b/.ci/clusters/values-function.yaml @@ -17,12 +17,8 @@ # under the License. # -monitoring: - prometheus: false - grafana: false - node_exporter: false - alert_manager: false - +kube-prometheus-stack: + enabled: false # disabled AntiAffinity affinity: diff --git a/.ci/clusters/values-jwt-asymmetric.yaml b/.ci/clusters/values-jwt-asymmetric.yaml index fbbf18b..83dfe43 100644 --- a/.ci/clusters/values-jwt-asymmetric.yaml +++ b/.ci/clusters/values-jwt-asymmetric.yaml @@ -17,12 +17,8 @@ # under the License. # -monitoring: - prometheus: false - grafana: false - node_exporter: false - alert_manager: false - +kube-prometheus-stack: + enabled: false # disabled AntiAffinity affinity: diff --git a/.ci/clusters/values-jwt-symmetric.yaml b/.ci/clusters/values-jwt-symmetric.yaml index 3bfba2d..de72dbc 100644 --- a/.ci/clusters/values-jwt-symmetric.yaml +++ b/.ci/clusters/values-jwt-symmetric.yaml @@ -17,12 +17,8 @@ # under the License. # -monitoring: - prometheus: false - grafana: false - node_exporter: false - alert_manager: false - +kube-prometheus-stack: + enabled: false # disabled AntiAffinity affinity: diff --git a/.ci/clusters/values-local-pv.yaml b/.ci/clusters/values-local-pv.yaml index 123424d..2364445 100644 --- a/.ci/clusters/values-local-pv.yaml +++ b/.ci/clusters/values-local-pv.yaml @@ -17,12 +17,8 @@ # under the License. # -monitoring: - prometheus: false - grafana: false - node_exporter: false - alert_manager: false - +kube-prometheus-stack: + enabled: false # disabled AntiAffinity affinity: diff --git a/.ci/clusters/values-pulsar-image.yaml b/.ci/clusters/values-pulsar-image.yaml index e6fbfec..230cb2c 100644 --- a/.ci/clusters/values-pulsar-image.yaml +++ b/.ci/clusters/values-pulsar-image.yaml @@ -17,11 +17,8 @@ # under the License. # -monitoring: - prometheus: false - grafana: false - node_exporter: false - alert_manager: false +kube-prometheus-stack: + enabled: false volumes: persistence: false diff --git a/.ci/clusters/values-tls.yaml b/.ci/clusters/values-tls.yaml index a946863..5b4e87e 100644 --- a/.ci/clusters/values-tls.yaml +++ b/.ci/clusters/values-tls.yaml @@ -17,12 +17,8 @@ # under the License. # -monitoring: - prometheus: false - grafana: false - node_exporter: false - alert_manager: false - +kube-prometheus-stack: + enabled: false # disabled AntiAffinity affinity: diff --git a/.ci/clusters/values-zk-tls.yaml b/.ci/clusters/values-zk-tls.yaml index 3961181..f679895 100644 --- a/.ci/clusters/values-zk-tls.yaml +++ b/.ci/clusters/values-zk-tls.yaml @@ -17,12 +17,8 @@ # under the License. # -monitoring: - prometheus: false - grafana: false - node_exporter: false - alert_manager: false - +kube-prometheus-stack: + enabled: false # disabled AntiAffinity affinity: diff --git a/.ci/clusters/values-zkbk-tls.yaml b/.ci/clusters/values-zkbk-tls.yaml index 376cfd1..aa23de7 100644 --- a/.ci/clusters/values-zkbk-tls.yaml +++ b/.ci/clusters/values-zkbk-tls.yaml @@ -17,12 +17,8 @@ # under the License. # -monitoring: - prometheus: false - grafana: false - node_exporter: false - alert_manager: false - +kube-prometheus-stack: + enabled: false # disabled AntiAffinity affinity: diff --git a/examples/values-bookkeeper-aws.yaml b/examples/values-bookkeeper-aws.yaml index d0c147a..7f6d89f 100644 --- a/examples/values-bookkeeper-aws.yaml +++ b/examples/values-bookkeeper-aws.yaml @@ -36,15 +36,9 @@ components: # pulsar manager pulsar_manager: false -monitoring: - # monitoring - prometheus - prometheus: false - # monitoring - grafana - grafana: false - # monitoring - node_exporter - node_exporter: false - # alerting - alert-manager - alert_manager: false +## disable monitoring stack +kube-prometheus-stack: + enabled: false zookeeper: volumes: diff --git a/examples/values-cs.yaml b/examples/values-cs.yaml index 1611c36..9bea3d3 100644 --- a/examples/values-cs.yaml +++ b/examples/values-cs.yaml @@ -36,10 +36,6 @@ components: # pulsar manager pulsar_manager: false -monitoring: - # monitoring - prometheus - prometheus: false - # monitoring - grafana - grafana: false - # monitoring - node_exporter - node_exporter: false \ No newline at end of file +## disable monitoring stack +kube-prometheus-stack: + enabled: false \ No newline at end of file diff --git a/examples/values-local-cluster.yaml b/examples/values-local-cluster.yaml index 19eac4a..69bb732 100644 --- a/examples/values-local-cluster.yaml +++ b/examples/values-local-cluster.yaml @@ -28,10 +28,5 @@ components: pulsar_manager: true ## disable monitoring stack -monitoring: - # monitoring - prometheus - prometheus: false - # monitoring - grafana - grafana: false - # monitoring - node_exporter - node_exporter: false \ No newline at end of file +kube-prometheus-stack: + enabled: false \ No newline at end of file diff --git a/examples/values-zookeeper-aws.yaml b/examples/values-zookeeper-aws.yaml index f273eb2..e1912ac 100644 --- a/examples/values-zookeeper-aws.yaml +++ b/examples/values-zookeeper-aws.yaml @@ -36,13 +36,9 @@ components: # pulsar manager pulsar_manager: false -monitoring: - # monitoring - prometheus - prometheus: false - # monitoring - grafana - grafana: false - # monitoring - node_exporter - node_exporter: false +## disable monitoring stack +kube-prometheus-stack: + enabled: false zookeeper: # External zookeeper server list in case of global-zk list to create zk cluster across zk deployed on different clusters/namespaces