modified: services/monitoring/deploy/prometheus/helm-values.yaml

modified:   services/monitoring/deploy/prometheus/prometheus-agent.yaml

services/monitoring/deploy/prometheus/helm-values.yaml

@@ -24,13 +24,26 @@ prometheus-node-exporter:
       - action: replace
         sourceLabels: [__meta_kubernetes_pod_node_name]
         targetLabel: nodename
+      - targetLabel: cluster
+        replacement: casa
 
 prometheus:
   enabled: false
 
-coreDns:
-  enabled: false
-
+coreDns: 
+  enabled: true
+  serviceMonitor:
+    relabelings:
+      - targetLabel: cluster
+        replacement: casa
+ 
+kubeApiServer: 
+  enabled: true
+  serviceMonitor:
+    relabelings:
+      - targetLabel: cluster
+        replacement: casa
+ 
 kubeControllerManager:
   enabled: false
 
@@ -43,6 +56,16 @@ kubeProxy:
 kubeScheduler:
   enabled: false
 
+kube-state-metrics:
+  podLabels:
+    role: worker-node
+  nodeSelector:
+    role: worker-node
+  prometheus:
+    monitor:
+        relabelings:
+        - targetLabel: cluster
+          replacement: casa
 
 prometheusOperator:
   kubeletService:
@@ -69,8 +92,7 @@ kubelet:
 
     probesMetricRelabelings:
       - targetLabel: cluster
-        replacement: icarus
-
+        replacement: casa
       - sourceLabels: [__name__, image]
         separator: ;
         regex: container_([a-z_]+);
@@ -88,7 +110,8 @@ kubelet:
 #     #
 #     # metrics_path is required to match upstream rules and charts
     cAdvisorRelabelings:
-    
+      - targetLabel: cluster
+        replacement: casa    
       - action: replace
         sourceLabels: [__metrics_path__]
         targetLabel: metrics_path
@@ -104,6 +127,8 @@ kubelet:
 #     #
     probesRelabelings:
 
+      - targetLabel: cluster
+        replacement: casa
       - action: replace
         sourceLabels: [__metrics_path__]
         targetLabel: metrics_path
@@ -116,7 +141,8 @@ kubelet:
         action: replace
 
     resourceRelabelings:
-
+      - targetLabel: cluster
+        replacement: casa
       - action: replace
         sourceLabels: [__metrics_path__]
         targetLabel: metrics_path

services/monitoring/deploy/prometheus/prometheus-agent.yaml

@@ -23,12 +23,6 @@ spec:
   replicas: 1
   remoteWrite:
     - url: https://prometheus.monitoring.limbosolutions.com/api/v1/write
-      writeRelabelConfigs:
-        - action: replace
-          targetLabel: cluster
-          replacement: casa
-        - action: keep
-          regex: .*
   scrapeInterval: 60s
   resources:
     requests: