Merge pull request #478 from yadneshk/node_exporter_scrape

Add "node-exporter" to Node Exporter's job name in scrape config
openstack-k8s-operators · Oct 1, 2024 · 85d3b6f · 85d3b6f
2 parents 0b65ef4 + 9a1b919
commit 85d3b6f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/controllers/metricstorage_controller.go b/controllers/metricstorage_controller.go
@@ -599,14 +599,15 @@ func (r *MetricStorageReconciler) createScrapeConfigs(
 	}
 
 	// ScrapeConfig for non-tls nodes
+	neServiceName := fmt.Sprintf("%s-node-exporter", telemetry.ServiceName)
 	err = r.createServiceScrapeConfig(ctx, instance, Log, "Node Exporter",
-		telemetry.ServiceName, endpointsNonTLS, false)
+		neServiceName, endpointsNonTLS, false)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
 
 	// ScrapeConfig for tls nodes
-	neServiceName := fmt.Sprintf("%s-tls", telemetry.ServiceName)
+	neServiceName = fmt.Sprintf("%s-node-exporter-tls", telemetry.ServiceName)
 	err = r.createServiceScrapeConfig(ctx, instance, Log, "Node Exporter",
 		neServiceName, endpointsTLS, true)
 	if err != nil {

diff --git a/tests/kuttl/suites/metricstorage/tests/01-assert.yaml b/tests/kuttl/suites/metricstorage/tests/01-assert.yaml
@@ -76,7 +76,7 @@ kind: ScrapeConfig
 metadata:
   labels:
     service: metricStorage
-  name: telemetry
+  name: telemetry-node-exporter
   ownerReferences:
   - kind: MetricStorage
     name: telemetry-kuttl

diff --git a/tests/kuttl/suites/metricstorage/tests/04-assert.yaml b/tests/kuttl/suites/metricstorage/tests/04-assert.yaml
@@ -88,7 +88,7 @@ kind: ScrapeConfig
 metadata:
   labels:
     service: metricStorage
-  name: telemetry
+  name: telemetry-node-exporter
   ownerReferences:
   - kind: MetricStorage
     name: telemetry-kuttl

diff --git a/tests/kuttl/suites/tls/tests/02-assert.yaml b/tests/kuttl/suites/tls/tests/02-assert.yaml
@@ -294,7 +294,7 @@ kind: ScrapeConfig
 metadata:
   labels:
     service: metricStorage
-  name: telemetry-tls
+  name: telemetry-node-exporter-tls
   ownerReferences:
   - kind: MetricStorage
     name: telemetry-kuttl-metricstorage
@@ -311,7 +311,7 @@ kind: ScrapeConfig
 metadata:
   labels:
     service: metricStorage
-  name: telemetry
+  name: telemetry-node-exporter
   ownerReferences:
   - kind: MetricStorage
     name: telemetry-kuttl-metricstorage