Support extra label selectors on mimir.rules.kubernetes #1773
+447
−119
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thampiotr
changed the title
thampiotr
commented
Sep 26, 2024
thampiotr
commented
Sep 26, 2024
thampiotr
commented
Sep 27, 2024
Comment on lines
+193
to
+200
| for i := range ruleGroup.Rules { | ||
| if ruleGroup.Rules[i].Labels == nil { | ||
| ruleGroup.Rules[i].Labels = make(map[string]string, len(e.externalLabels)) | ||
| } | ||
| maps.Copy(ruleGroup.Rules[i].Labels, e.externalLabels) | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Just a rename of non-idiomatic rule_group variable here.
thampiotr
commented
Sep 27, 2024
Comment on lines
+202
to
+210
| if e.extraQueryMatchers != nil { | ||
| for _, ruleGroup := range groups { | ||
| for i := range ruleGroup.Rules { | ||
| query := ruleGroup.Rules[i].Expr.Value | ||
| newQuery, err := addMatchersToQuery(query, e.extraQueryMatchers.Matchers) | ||
| if err != nil { | ||
| level.Error(e.logger).Log("msg", "failed to add labels to PrometheusRule query", "query", query, "err", err) | ||
| } | ||
| maps.Copy(rule_group.Rules[i].Labels, e.externalLabels) | ||
| ruleGroup.Rules[i].Expr.Value = newQuery |
thampiotr
commented
Sep 27, 2024
|
|
||
| expectedRule := `- name: group1 | ||
| rules: | ||
| - expr: "sum by (namespace) (rate(success{cluster=~\"prod-.*\",job=\"good\"}[10m]) / rate(total{cluster=~\"prod-.*\",job=\"good\"}[10m]))" |
There was a problem hiding this comment.
This shows how for queries that refer multiple metrics, the extra matchers will be added to all metric selectors.
thampiotr
commented
Sep 27, 2024
Comment on lines
+51
to
+72
| extra_query_matchers { | ||
| matcher { | ||
| name = "job" | ||
| match_type = "!=" | ||
| value = "bar" | ||
| } | ||
| matcher { | ||
| name = "namespace" | ||
| match_type = "=" | ||
| value = "all" | ||
| } | ||
| matcher { | ||
| name = "namespace" | ||
| match_type = "!~" | ||
| value = ".+" | ||
| } | ||
| matcher { | ||
| name = "cluster" | ||
| match_type = "=~" | ||
| value = "prod-.*" | ||
| } | ||
| } |
There was a problem hiding this comment.
Example of user-facing config.
thampiotr
changed the title
docs/sources/reference/components/mimir/mimir.rules.kubernetes.md
Outdated
Show resolved
Hide resolved
docs/sources/reference/components/mimir/mimir.rules.kubernetes.md
Outdated
Show resolved
Hide resolved
wildum
reviewed
Sep 30, 2024
Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
wildum
approved these changes
Sep 30, 2024
thampiotr
deleted the
thampiotr/support-extra-labels-on-mimir-rule-queries
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Description
The goal is to allow mimir.rules.kubernetes to add extra matchers to queries, using the same code as the promtool does here.
Which issue(s) this PR fixes
Internal request.
Notes to the Reviewer
PR Checklist