mimirtool rules sync: fix sync when query_offset or evaluation_delay change #8297
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
krajorama
reviewed
Jun 6, 2024
pkg/mimirtool/rules/compare.go
Outdated
| @@ -132,6 +134,14 @@ func CompareGroups(groupOne, groupTwo rwrulefmt.RuleGroup) error { | |||
| return errDiffRWConfigs | |||
| } | |||
|
|
|||
| if ((groupOne.EvaluationDelay == nil) != (groupTwo.EvaluationDelay == nil)) || (groupOne.EvaluationDelay != nil && groupTwo.EvaluationDelay != nil && *groupOne.EvaluationDelay != *groupTwo.EvaluationDelay) { | |||
There was a problem hiding this comment.
groupOne.EvaluationDelay == nil should be treated the same as groupOne.EvaluationDelay != nil && *groupOne.EvaluationDelay == 0 as we do not store the zero value, so the tool could get into an infinite loop trying to sync the 0 value.
There was a problem hiding this comment.
Good point. I should have addressed it here: e9baaa2. It also allowed me to simplify the comparison.
…change Signed-off-by: Marco Pracucci <marco@pracucci.com>
pracucci
force-pushed
the
fix-mimirtools-rules-sync
branch
from
8155020
to
3ea59f4
Compare
Signed-off-by: Marco Pracucci <marco@pracucci.com>
krajorama
approved these changes
Jun 7, 2024
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.
What this PR does
This PR builds on #8295. While testing #8295 I've noticed that the rule group config is not re-synched if you only change
query_offsetorevaluation_delay. That's because we don't check these fields in the comparison.This PR fixes it.
Which issue(s) this PR fixes or relates to
N/A
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.