Merge pull request #706 from mgirgisf/Prom-scrapeconfig

openshift-merge-bot[bot] · web-flow · commit 9d18f92a226d · 2025-06-26T12:58:04.000Z
update scrapeconfig for prom-exporter
diff --git a/controllers/metricstorage_controller.go b/controllers/metricstorage_controller.go
@@ -841,12 +841,12 @@ func (r *MetricStorageReconciler) createScrapeConfigs(
 		return ctrl.Result{}, err
 	}
 	// openstack Ceilometer Compute's prom exporters
-	err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "ceilometer-compute-prom-exporter", telemetryv1.DefaultCeilometerComputePromExporterPort, true)
+	err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "ceilometer-compute-prom-exporter", telemetryv1.DefaultCeilometerComputePromExporterPort, false)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
 	// openstack Ceilometer IPMI's prom exporters
-	err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "ceilometer-ipmi-prom-exporter", telemetryv1.DefaultCeilometerIpmiPromExporterPort, true)
+	err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "ceilometer-ipmi-prom-exporter", telemetryv1.DefaultCeilometerIpmiPromExporterPort, false)
 	if err != nil {
 		return ctrl.Result{}, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -841,12 +841,12 @@ func (r *MetricStorageReconciler) createScrapeConfigs(`
`841`	`841`	`return ctrl.Result{}, err`
`842`	`842`	`}`
`843`	`843`	`// openstack Ceilometer Compute's prom exporters`
`844`		`- err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "ceilometer-compute-prom-exporter", telemetryv1.DefaultCeilometerComputePromExporterPort, true)`
	`844`	`+ err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "ceilometer-compute-prom-exporter", telemetryv1.DefaultCeilometerComputePromExporterPort, false)`
`845`	`845`	`if err != nil {`
`846`	`846`	`return ctrl.Result{}, err`
`847`	`847`	`}`
`848`	`848`	`// openstack Ceilometer IPMI's prom exporters`
`849`		`- err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "ceilometer-ipmi-prom-exporter", telemetryv1.DefaultCeilometerIpmiPromExporterPort, true)`
	`849`	`+ err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "ceilometer-ipmi-prom-exporter", telemetryv1.DefaultCeilometerIpmiPromExporterPort, false)`
`850`	`850`	`if err != nil {`
`851`	`851`	`return ctrl.Result{}, err`
`852`	`852`	`}`