fix: missing entry for kueue and kfto in monitoring

- reorder and rename Signed-off-by: Wen Zhou <[email protected]>
VaishnaviHire · Jun 17, 2024 · 6b6a93a · 6b6a93a
1 parent bfb2133
commit 6b6a93a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/components/component.go b/components/component.go
@@ -117,8 +117,6 @@ func (c *Component) UpdatePrometheusConfig(_ client.Client, enable bool, compone
 			PrometheusYML          string `yaml:"prometheus.yml"`
 			OperatorRules          string `yaml:"operator-recording.rules"`
 			DeadManSnitchRules     string `yaml:"deadmanssnitch-alerting.rules"`
-			CFRRules               string `yaml:"codeflare-recording.rules"`
-			CRARules               string `yaml:"codeflare-alerting.rules"`
 			DashboardRRules        string `yaml:"rhods-dashboard-recording.rules"`
 			DashboardARules        string `yaml:"rhods-dashboard-alerting.rules"`
 			DSPRRules              string `yaml:"data-science-pipelines-operator-recording.rules"`
@@ -127,15 +125,15 @@ func (c *Component) UpdatePrometheusConfig(_ client.Client, enable bool, compone
 			MMARules               string `yaml:"model-mesh-alerting.rules"`
 			OdhModelRRules         string `yaml:"odh-model-controller-recording.rules"`
 			OdhModelARules         string `yaml:"odh-model-controller-alerting.rules"`
+			CFORRules              string `yaml:"codeflare-recording.rules"`
+			CFOARules              string `yaml:"codeflare-alerting.rules"`
 			RayARules              string `yaml:"ray-alerting.rules"`
+			KueueARules            string `yaml:"kueue-alerting.rules"`
+			TrainingOperatorARules string `yaml:"trainingoperator-alerting.rules"`
 			WorkbenchesRRules      string `yaml:"workbenches-recording.rules"`
 			WorkbenchesARules      string `yaml:"workbenches-alerting.rules"`
 			KserveRRules           string `yaml:"kserve-recording.rules"`
 			KserveARules           string `yaml:"kserve-alerting.rules"`
-			KueueRRules            string `yaml:"kueue-recording.rules"`
-			KueueARules            string `yaml:"kueue-alerting.rules"`
-			TrainingOperatorRRules string `yaml:"trainingoperator-recording.rules"`
-			TrainingOperatorARules string `yaml:"trainingoperator-alerting.rules"`
 		} `yaml:"data"`
 	}
 	var configMap ConfigMap

diff --git a/controllers/dscinitialization/monitoring.go b/controllers/dscinitialization/monitoring.go
@@ -59,6 +59,8 @@ func (r *DSCInitializationReconciler) configureManagedMonitoring(ctx context.Con
 				"(.*)-(.*)odh-model-controller(.*).rules":            "",
 				"(.*)-(.*)ray(.*).rules":                             "",
 				"(.*)-(.*)trustyai(.*).rules":                        "",
+				"(.*)-(.*)kueue(.*).rules":                           "",
+				"(.*)-(.*)trainingoperator(.*).rules":                "",
 			})
 		if err != nil {
 			r.Log.Error(err, "error to remove previous enabled component rules")