From f09c1ec86bc3c8cd752f2cd9f1a2e26d931266ee Mon Sep 17 00:00:00 2001
From: Vojtech Mares <iam@vojtechmares.com>
Date: Tue, 6 Sep 2022 17:36:51 +0200
Subject: [PATCH] refactor(monitoring): do not monitor cluster components

---
 monitoring/values.yaml | 53 +++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 32 deletions(-)

diff --git a/monitoring/values.yaml b/monitoring/values.yaml
index 538cbdf..bea8d7f 100644
--- a/monitoring/values.yaml
+++ b/monitoring/values.yaml
@@ -13,6 +13,27 @@ kube-prometheus-stack:
   kubeStateMetrics:
     enabled: false
 
+  kubeApiServer:
+    enabled: false
+
+  kubelet:
+    enabled: false
+
+  kubeControllerManager:
+    enabled: false
+
+  coreDns:
+    enabled: false
+
+  kubeScheduler:
+    enabled: false
+
+  kubeProxy:
+    enabled: false
+
+  defaultRules:
+    create: false
+
   prometheus:
     prometheusSpec:
       serviceMonitorSelectorNilUsesHelmValues: false
@@ -96,37 +117,5 @@ kube-prometheus-stack:
     serviceMonitor:
       selfMonitor: true
 
-    # This AM is for KISSJ, cluster components are monitored by different instance
-    kubeApiServer:
-      enabled: false
-
-    kubelet:
-      enabled: false
-
-    kubeControllerManager:
-      enabled: false
-
-    coreDns:
-      enabled: false
-
-    kubeScheduler:
-      enabled: false
-
-    kubeProxy:
-      enabled: false
-
-    kubeStateMetrics:
-      enabled: false
-
-    nodeExporter:
-      enabled: false
-
-    prometheusOperator:
-      serviceMonitor:
-        selfMonitor: false
-
-    defaultRules:
-      create: false
-
 prometheus-blackbox-exporter:
   fullnameOverride: kissj-blackbox-exporter