Merge pull request #750 from karelyatin/OSPRH-12563

Add OVN Controller metric scrape config

Author: openshift-merge-bot[bot]

controllers/metricstorage_controller.go

@@ -868,6 +868,12 @@ func (r *MetricStorageReconciler) createScrapeConfigs(
 		return ctrl.Result{}, err
 	}
 
+	// ScrapeConfig for OVN Controller metrics
+	err = r.createOVNControllerScrapeConfig(ctx, instance, helper, serviceLabels)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
 	instance.Status.Conditions.MarkTrue(telemetryv1.ScrapeConfigReadyCondition, condition.ReadyMessage)
 	return ctrl.Result{}, nil
 }
@@ -941,72 +947,109 @@ func (r *MetricStorageReconciler) createComputeScrapeConfig(
 	return nil
 }
 
-func (r *MetricStorageReconciler) createOVNNorthdScrapeConfig(
+func (r *MetricStorageReconciler) createServiceScrapeConfigFromLabelSelector(
 	ctx context.Context,
 	instance *telemetryv1.MetricStorage,
 	helper *helper.Helper,
 	serviceLabels map[string]string,
+	labelSelector map[string]string,
+	portName string,
+	scrapeConfigName string,
+	description string,
 ) error {
 	Log := r.GetLogger(ctx)
 
-	// Discover OVN Northd metrics services using label selectors
-	// This matches the labels set in controllers/ovnnorthd_controller.go:647-649
+	// Discover metrics services using label selectors
 	serviceList := &corev1.ServiceList{}
 	listOpts := []client.ListOption{
 		client.InNamespace(instance.Namespace),
-		client.MatchingLabels{
-			"type":    "metrics",
-			"service": "ovn-northd",
-		},
+		client.MatchingLabels(labelSelector),
 	}
 	err := helper.GetClient().List(ctx, serviceList, listOpts...)
 	if err != nil {
-		Log.Info(fmt.Sprintf("Cannot get OVN Northd metrics services. Scrape configs not created. Error: %s", err))
+		Log.Info(fmt.Sprintf("Cannot get %s metrics services. Scrape configs not created. Error: %s", description, err))
 		return nil
 	}
 
 	if len(serviceList.Items) == 0 {
-		Log.Info("No OVN Northd metrics services found")
+		Log.Info(fmt.Sprintf("No %s metrics services found", description))
 		return nil
 	}
 
 	// Create targets from discovered services
-	var ovnNorthdTargets []string
+	var targets []string
 	for _, svc := range serviceList.Items {
-		// Find the metrics port (should be named "metrics" with port 1981)
+		// Find the specified port
 		for _, port := range svc.Spec.Ports {
-			if port.Name == "metrics" {
+			if port.Name == portName {
 				serviceRoute := fmt.Sprintf("%s.%s.svc", svc.Name, svc.Namespace)
 				target := net.JoinHostPort(serviceRoute, strconv.Itoa(int(port.Port)))
-				ovnNorthdTargets = append(ovnNorthdTargets, target)
-				Log.Info(fmt.Sprintf("Found OVN Northd metrics service: %s", target))
+				targets = append(targets, target)
+				Log.Info(fmt.Sprintf("Found %s metrics service: %s", description, target))
 				break
 			}
 		}
 	}
 
-	if len(ovnNorthdTargets) == 0 {
-		Log.Info("No valid OVN Northd metrics targets found")
+	if len(targets) == 0 {
+		Log.Info(fmt.Sprintf("No valid %s metrics targets found", description))
 		return nil
 	}
 
-	// Create scrape config for OVN Northd metrics
-	ovnNorthdCfgName := fmt.Sprintf("%s-ovn-northd", telemetry.ServiceName)
+	// Create scrape config for metrics
 	desiredScrapeConfig := metricstorage.ScrapeConfig(
 		instance,
 		serviceLabels,
-		ovnNorthdTargets,
+		targets,
 		instance.Spec.PrometheusTLS.Enabled(),
 	)
-	err = r.createServiceScrapeConfig(ctx, instance, Log, "OVN Northd",
-		ovnNorthdCfgName, desiredScrapeConfig)
+	err = r.createServiceScrapeConfig(ctx, instance, Log, description,
+		scrapeConfigName, desiredScrapeConfig)
 	if err != nil {
 		return err
 	}
 
 	return nil
 }
 
+// createOVNNorthdScrapeConfig creates a scrape configuration for OVN Northd metrics
+// This function discovers OVN Northd metrics services using label selectors
+func (r *MetricStorageReconciler) createOVNNorthdScrapeConfig(
+	ctx context.Context,
+	instance *telemetryv1.MetricStorage,
+	helper *helper.Helper,
+	serviceLabels map[string]string,
+) error {
+	labelSelector := map[string]string{
+		"type":    "metrics",
+		"service": "ovn-northd",
+	}
+	ovnNorthdCfgName := fmt.Sprintf("%s-ovn-northd", telemetry.ServiceName)
+	return r.createServiceScrapeConfigFromLabelSelector(
+		ctx, instance, helper, serviceLabels,
+		labelSelector, "metrics", ovnNorthdCfgName, "OVN Northd",
+	)
+}
+
+// createOVNControllerScrapeConfig creates a scrape configuration for OVN Controller metrics
+// This function discovers OVN Controller metrics services using label selectors
+func (r *MetricStorageReconciler) createOVNControllerScrapeConfig(
+	ctx context.Context,
+	instance *telemetryv1.MetricStorage,
+	helper *helper.Helper,
+	serviceLabels map[string]string,
+) error {
+	labelSelector := map[string]string{
+		"type":    "metrics",
+		"service": "ovn-controller-metrics",
+	}
+	ovnControllerCfgName := fmt.Sprintf("%s-ovn-controller", telemetry.ServiceName)
+	return r.createServiceScrapeConfigFromLabelSelector(
+		ctx, instance, helper, serviceLabels,
+		labelSelector, "metrics", ovnControllerCfgName, "OVN Controller",
+	)
+}
+
 func (r *MetricStorageReconciler) createDashboardObjects(ctx context.Context, instance *telemetryv1.MetricStorage, helper *helper.Helper, eventHandler handler.EventHandler) (ctrl.Result, error) {
 	Log := r.GetLogger(ctx)
 	uiPluginObj := &obsui.UIPlugin{
@@ -1423,9 +1466,9 @@ func (r *MetricStorageReconciler) SetupWithManager(ctx context.Context, mgr ctrl
 	ovnMetricsServiceWatchFn := func(_ context.Context, o client.Object) []reconcile.Request {
 		result := []reconcile.Request{}
 
-		// Only watch OVN northd metrics services
+		// Watch OVN metrics services
 		if labels := o.GetLabels(); labels != nil {
-			if labels["type"] == "metrics" && labels["service"] == "ovn-northd" {
+			if labels["type"] == "metrics" && (labels["service"] == "ovn-northd" || labels["service"] == "ovn-controller-metrics") {
 				// get all metricstorage CRs in the same namespace
 				metricStorages := &telemetryv1.MetricStorageList{}
 				listOpts := []client.ListOption{