Address comments

Signed-off-by: Eunice Kim <[email protected]>

Author: euniceek

CHANGELOG.md

@@ -22,12 +22,12 @@
 * [ENHANCEMENT] Upgrade go to 1.22.5 #6014 #6072
 * [ENHANCEMENT] Ingester: Add a new experimental `-ingester.labels-string-interning-enabled` flag to enable string interning for metrics labels. #6057
 * [ENHANCEMENT] Ingester: Add link to renew 10% of the ingesters tokens in the admin page. #6063
+* [ENHANCEMENT] Ruler: Add support for filtering by `state` and `health` field on Rules API. #6040
+* [ENHANCEMENT] Ruler: Add support for filtering by `match` field on Rules API. #6083
 * [BUGFIX] Configsdb: Fix endline issue in db password. #5920
 * [BUGFIX] Ingester: Fix `user` and `type` labels for the `cortex_ingester_tsdb_head_samples_appended_total` TSDB metric. #5952
 * [BUGFIX] Querier: Enforce max query length check for `/api/v1/series` API even though `ignoreMaxQueryLength` is set to true. #6018
 * [BUGFIX] Ingester: Fix issue with the minimize token generator where it was not taking in consideration the current ownerhip of an instance when generating extra tokens. #6062
-* [ENHANCEMENT] Ruler: Add support for filtering by `state` and `health` field on Rules API. #6040
-* [ENHANCEMENT] Ruler: Add support for filtering by `match` field on Rules API. #6083
 
 ## 1.17.1 2024-05-20
 

pkg/ruler/api.go

@@ -161,7 +161,7 @@ func (a *API) PrometheusRules(w http.ResponseWriter, req *http.Request) {
 		Type:           typ,
 		State:          state,
 		Health:         health,
-		Matches:        req.Form["match[]"],
+		Matchers:       req.Form["match[]"],
 	}
 
 	w.Header().Set("Content-Type", "application/json")

pkg/ruler/ruler.go

@@ -884,7 +884,7 @@ func (r *Ruler) getLocalRules(userID string, rulesRequest RulesRequest, includeB
 	ruleType := rulesRequest.Type
 	alertState := rulesRequest.State
 	health := rulesRequest.Health
-	matcherSets, err := parseMatchersParam(rulesRequest.Matches)
+	matcherSets, err := parseMatchersParam(rulesRequest.Matchers)
 	if err != nil {
 		return nil, errors.Wrap(err, "error parsing matcher values")
 	}
@@ -932,7 +932,7 @@ func (r *Ruler) getLocalRules(userID string, rulesRequest RulesRequest, includeB
 			if !returnByHealth(health, string(r.Health())) {
 				continue
 			}
-			if !matches(matcherSets, r.Labels()) {
+			if !matchesMatcherSets(matcherSets, r.Labels()) {
 				continue
 			}
 			lastError := ""
@@ -1077,7 +1077,7 @@ func (r *Ruler) ruleGroupListToGroupStateDesc(userID string, backupGroups rulesp
 					continue
 				}
 			}
-			if !matches(filters.matcherSets, cortexpb.FromLabelAdaptersToLabels(r.Labels)) {
+			if !matchesMatcherSets(filters.matcherSets, cortexpb.FromLabelAdaptersToLabels(r.Labels)) {
 				continue
 			}
 
@@ -1174,7 +1174,7 @@ func (r *Ruler) getShardedRules(ctx context.Context, userID string, rulesRequest
 			RuleGroupNames: rulesRequest.GetRuleGroupNames(),
 			Files:          rulesRequest.GetFiles(),
 			Type:           rulesRequest.GetType(),
-			Matches:        rulesRequest.GetMatches(),
+			Matchers:       rulesRequest.GetMatchers(),
 		})
 
 		if err != nil {
@@ -1356,17 +1356,26 @@ OUTER:
 	return matcherSets, nil
 }
 
-func matches(matcherSets [][]*labels.Matcher, l labels.Labels) bool {
+func matches(l labels.Labels, matchers ...*labels.Matcher) bool {
+	for _, m := range matchers {
+		if v := l.Get(m.Name); !m.Matches(v) {
+			return false
+		}
+	}
+	return true
+}
+
+// matchesMatcherSets ensures all matches in each matcher set are ANDed and the set of those is ORed.
+func matchesMatcherSets(matcherSets [][]*labels.Matcher, l labels.Labels) bool {
 	if len(matcherSets) == 0 {
 		return true
 	}
 
+	var ok bool
 	for _, matchers := range matcherSets {
-		for _, m := range matchers {
-			if v := l.Get(m.Name); m.Matches(v) {
-				return true
-			}
+		if matches(l, matchers...) {
+			ok = true
 		}
 	}
-	return false
+	return ok
 }

pkg/ruler/ruler.pb.go

@@ -26,7 +26,7 @@ message RulesRequest {
   string type = 4;
   string state = 5;
   string health = 6;
-  repeated string matches = 7;
+  repeated string matchers = 7;
 }
 
 message RulesResponse {