chore(module): add d8_* prefix and fix lost namespce label

Signed-off-by: Pavel Tishkov <[email protected]>
deckhouse · Aug 19, 2024 · 71ddbb5 · 71ddbb5
1 parent 4694b5e
commit 71ddbb5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/images/virtualization-artifact/pkg/monitoring/metrics/virtualmachine/collector.go b/images/virtualization-artifact/pkg/monitoring/metrics/virtualmachine/collector.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	MetricVirtualMachineStatusPhase = "virtualmachine_status_phase"
+	MetricVirtualMachineStatusPhase = "d8_virtualization_virtualmachine_status_phase"
 )
 
 var virtualMachineMetrics = map[string]*prometheus.Desc{

diff --git a/images/virtualization-artifact/pkg/monitoring/metrics/vmbda/collector.go b/images/virtualization-artifact/pkg/monitoring/metrics/vmbda/collector.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	MetricVMBDAStatusPhase = "virtualmachineblockdeviceattachment_status_phase"
+	MetricVMBDAStatusPhase = "d8_virtualization_virtualmachineblockdeviceattachment_status_phase"
 )
 
 var vmbdaMetrics = map[string]*prometheus.Desc{

diff --git a/templates/virtualization-controller/scrape-config.yaml b/templates/virtualization-controller/scrape-config.yaml
@@ -18,16 +18,5 @@ spec:
     - targets: ['virtualization-controller-metrics.d8-{{ .Chart.Name }}.svc.{{ .Values.global.discovery.clusterDomain }}.:8080']
   relabelings:
     - action: labeldrop
-      regex: (container|endpoint|job|service|pod|exported_namespace|uid)
-  metricRelabelings:
-    - sourceLabels: [__name__]
-      regex: "(.*)"
-      separator: ;
-      action: replace
-      targetLabel: __name__
-      replacement: d8_$1
-    - action: replace
-      sourceLabels:
-      - exported_namespace
-      targetLabel: namespace
+      regex: (job)
   metricsPath: '/metrics'