Merge pull request #711 from openshift-cherrypick-robot/cherry-pick-706-to-18.0-fr3

openshift-merge-bot[bot] · web-flow · commit fbabbc4d62d5 · 2025-06-26T15:17:37.000Z
[18.0-fr3] update scrapeconfig for prom-exporter
diff --git a/controllers/metricstorage_controller.go b/controllers/metricstorage_controller.go
@@ -836,12 +836,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
`@@ -836,12 +836,12 @@ func (r *MetricStorageReconciler) createScrapeConfigs(`
`836`	`836`	`return ctrl.Result{}, err`
`837`	`837`	`}`
`838`	`838`	`// openstack Ceilometer Compute's prom exporters`
`839`		`- err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "ceilometer-compute-prom-exporter", telemetryv1.DefaultCeilometerComputePromExporterPort, true)`
	`839`	`+ err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "ceilometer-compute-prom-exporter", telemetryv1.DefaultCeilometerComputePromExporterPort, false)`
`840`	`840`	`if err != nil {`
`841`	`841`	`return ctrl.Result{}, err`
`842`	`842`	`}`
`843`	`843`	`// openstack Ceilometer IPMI's prom exporters`
`844`		`- err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "ceilometer-ipmi-prom-exporter", telemetryv1.DefaultCeilometerIpmiPromExporterPort, true)`
	`844`	`+ err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "ceilometer-ipmi-prom-exporter", telemetryv1.DefaultCeilometerIpmiPromExporterPort, false)`
`845`	`845`	`if err != nil {`
`846`	`846`	`return ctrl.Result{}, err`
`847`	`847`	`}`