rules: fix silly mistakes in the rules API #2957
Merged
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
Fixes thanos-io#2938 and is a follow up to thanos-io#2925. Changes: * Copying all fields properly to the group-level as well * Set TZ to UTC explicitly in other `time.Time` fields to avoid a panic * Make sure that `RuleGroup` always has an empty array in the `rules` field because that's customary and that is what the new React UI expects. Manual testing for now. Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
It has been marked deprecated for more than 2 months. Remove it finally. Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
onprem
approved these changes
Aug 4, 2020
squat
approved these changes
Aug 10, 2020
Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com> Co-authored-by: Lucas Servén Marín <lserven@gmail.com>
Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com> Co-authored-by: Lucas Servén Marín <lserven@gmail.com>
bwplotka
approved these changes
Aug 11, 2020
| @@ -73,7 +73,6 @@ message RuleGroup { | |||
| google.protobuf.Timestamp last_evaluation = 6 [(gogoproto.jsontag) = "lastEvaluation", (gogoproto.stdtime) = true, (gogoproto.nullable) = false ]; | |||
|
|
|||
| // Thanos specific. | |||
| PartialResponseStrategy DeprecatedPartialResponseStrategy = 7 [(gogoproto.jsontag) = "partial_response_strategy"]; | |||
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.
Fixes #2938 and is a follow up to #2925.
Changes:
time.Timefields to avoid a panic;RuleGroupalways has an empty array in therulesfield because that's customary and that is what the new React UI
expects;
DeprecatedPartialResponseStrategyso that we wouldn'thave essentially two fields in the response of
/api/v1/rulesthat couldpotentially show different values because one of them is locked to
always be
WARN.The new e2e test case tests out the first change written in this list and the last one
is covered by unit tests that were changed to work with these modifications.
Signed-off-by: Giedrius Statkevičius giedriuswork@gmail.com