Revert "feat: add metric relabeling so namespace label has the correc…

…t value (which is the same as container_namespace) applied after scraping" This reverts commit 05f3ac1. Signed-off-by: Bastien Grasnick <[email protected]>
sustainable-computing-io · Nov 20, 2023 · 49559f5 · 49559f5
1 parent 1e395b7
commit 49559f5
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/pkg/components/exporter/exporter.go b/pkg/components/exporter/exporter.go
@@ -489,14 +489,6 @@ func NewServiceMonitor() *monv1.ServiceMonitor {
 		TargetLabel: "instance",
 	}}
 
-	metricRelabelings := []*monv1.RelabelConfig{{
-		Action: "replace",
-		SourceLabels: []monv1.LabelName{
-			"container_namespace",
-		},
-		TargetLabel: "namespace",
-	}}
-
 	return &monv1.ServiceMonitor{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: monv1.SchemeGroupVersion.String(),
@@ -509,11 +501,10 @@ func NewServiceMonitor() *monv1.ServiceMonitor {
 		},
 		Spec: monv1.ServiceMonitorSpec{
 			Endpoints: []monv1.Endpoint{{
-				Port:                 ServicePortName,
-				Interval:             "3s",
-				Scheme:               "http",
-				RelabelConfigs:       relabelings,
-				MetricRelabelConfigs: metricRelabelings,
+				Port:           ServicePortName,
+				Interval:       "3s",
+				Scheme:         "http",
+				RelabelConfigs: relabelings,
 			}},
 			JobLabel: "app.kubernetes.io/name",
 			Selector: metav1.LabelSelector{