Add "node-exporter" to Node Exporter's job name in scrape config

Author: yadneshk

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 {

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

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

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