From cf0446840453a9b4cf8975d71b4e503682248a59 Mon Sep 17 00:00:00 2001
From: Pavel Tishkov <pavel.tishkov@flant.com>
Date: Tue, 23 Sep 2025 14:10:11 +0300
Subject: [PATCH] fix(module): change servicemonitor and scrapeconfig namespace

Signed-off-by: Pavel Tishkov <pavel.tishkov@flant.com>
---
 .../virtualization-controller.yaml                |  4 ++--
 templates/cdi/service-monitor.yaml                | 15 +--------------
 templates/dvcr/service-monitor.yaml               |  2 +-
 templates/kubevirt/service-monitor.yaml           |  2 +-
 templates/namespace.yaml                          |  2 +-
 .../virtualization-controller/scrape-config.yaml  |  2 +-
 6 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/monitoring/prometheus-rules/virtualization-controller.yaml b/monitoring/prometheus-rules/virtualization-controller.yaml
index c5fb9aa1ca..46b59dc55d 100644
--- a/monitoring/prometheus-rules/virtualization-controller.yaml
+++ b/monitoring/prometheus-rules/virtualization-controller.yaml
@@ -1,7 +1,7 @@
 - name: kubernetes.virtualization.controller_state
   rules:
     - alert: D8VirtualizationControllerTargetDown
-      expr: max by (job) (up{job="scrapeconfig/d8-monitoring/virtualization-controller"}) == 0
+      expr: max by (job) (up{job="scrapeconfig/d8-virtualization/virtualization-controller"}) == 0
       for: 1m
       labels:
         severity_level: "6"
@@ -19,7 +19,7 @@
           2. Or check the Pod logs: `kubectl -n d8-virtualization logs deploy/virtualization-controller`
 
     - alert: D8VirtualizationControllerTargetAbsent
-      expr: absent(up{job="scrapeconfig/d8-monitoring/virtualization-controller"}) == 1
+      expr: absent(up{job="scrapeconfig/d8-virtualization/virtualization-controller"}) == 1
       labels:
         severity_level: "6"
         tier: cluster
diff --git a/templates/cdi/service-monitor.yaml b/templates/cdi/service-monitor.yaml
index 4ea84d6c16..f514c64cd5 100644
--- a/templates/cdi/service-monitor.yaml
+++ b/templates/cdi/service-monitor.yaml
@@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ .Chart.Name }}-cdi
-  namespace: d8-monitoring
+  namespace: d8-{{ .Chart.Name }}
   {{- include "helm_lib_module_labels" (list $ (dict "prometheus" "main")) | nindent 2 }}
 spec:
   endpoints:
@@ -13,19 +13,6 @@ spec:
       name: prometheus-token
     path: /metrics
     port: metrics
-    # relabelings:
-    # - action: labeldrop
-    #   regex: endpoint|namespace|pod|container
-    # - action: replace
-    #   replacement: linstor-controller
-    #   targetLabel: job
-    # - action: replace
-    #   replacement: cluster
-    #   targetLabel: tier
-    # - action: keep
-    #   regex: "true"
-    #   sourceLabels:
-    #   - __meta_kubernetes_endpoint_ready
     scheme: https
     tlsConfig:
       insecureSkipVerify: true
diff --git a/templates/dvcr/service-monitor.yaml b/templates/dvcr/service-monitor.yaml
index 812e893f22..e2f35296fd 100644
--- a/templates/dvcr/service-monitor.yaml
+++ b/templates/dvcr/service-monitor.yaml
@@ -5,7 +5,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: dvcr
-  namespace: d8-monitoring
+  namespace: d8-{{ .Chart.Name }}
   {{- include "helm_lib_module_labels" (list . (dict "app" "dvcr" "prometheus" "main")) | nindent 2 }}
 spec:
   endpoints:
diff --git a/templates/kubevirt/service-monitor.yaml b/templates/kubevirt/service-monitor.yaml
index 285edfd585..61a2aff2bb 100644
--- a/templates/kubevirt/service-monitor.yaml
+++ b/templates/kubevirt/service-monitor.yaml
@@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ .Chart.Name }}-virt-handler
-  namespace: d8-monitoring
+  namespace: d8-{{ .Chart.Name }}
   {{- include "helm_lib_module_labels" (list $ (dict "prometheus" "main")) | nindent 2 }}
 spec:
   endpoints:
diff --git a/templates/namespace.yaml b/templates/namespace.yaml
index c9603ebac9..5dcc558ad0 100644
--- a/templates/namespace.yaml
+++ b/templates/namespace.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  {{- include "helm_lib_module_labels" (list . (dict "prometheus.deckhouse.io/rules-watcher-enabled" "true")) | nindent 2 }}
+  {{- include "helm_lib_module_labels" (list . (dict "prometheus.deckhouse.io/rules-watcher-enabled" "true" "prometheus.deckhouse.io/monitor-watcher-enabled" "true" "prometheus.deckhouse.io/scrape-configs-watcher-enabled" "true")) | nindent 2 }}
   name: d8-{{ .Chart.Name }}
 ---
 {{- include "helm_lib_kube_rbac_proxy_ca_certificate" (list . (printf "d8-%s"  .Chart.Name)) }}
diff --git a/templates/virtualization-controller/scrape-config.yaml b/templates/virtualization-controller/scrape-config.yaml
index 68e8e4ebf9..55e25ade75 100644
--- a/templates/virtualization-controller/scrape-config.yaml
+++ b/templates/virtualization-controller/scrape-config.yaml
@@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1alpha1
 kind: ScrapeConfig
 metadata:
   name: virtualization-controller
-  namespace: d8-monitoring
+  namespace: d8-{{ .Chart.Name }}
   {{- include "helm_lib_module_labels" (list . (dict "app" "virtualization-controller" "prometheus" "main")) | nindent 2 }}
 spec:
   honorLabels: true