This repository has been archived by the owner on Apr 26, 2021. It is now read-only.
Ruler API modifications #50
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
gotjosh
reviewed
Apr 14, 2021
pkg/api/cortex-ruler.go
Outdated
| @@ -186,11 +203,52 @@ func (c *GettableRuleGroupConfig) validate() error { | |||
| return nil | |||
| } | |||
|
|
|||
| // ApiDuration extends model.Duration | |||
| // for handling JSON serialization/deserialization | |||
| type ApiDuration model.Duration | |||
There was a problem hiding this comment.
Suggested change
| type ApiDuration model.Duration | |
| type Duration model.Duration |
This ia already part of the api package, I believe it's redundant.
There was a problem hiding this comment.
sorry, I don't fully understand; why it's redundant?
| } | ||
| return GrafanaManagedRule | ||
|
|
||
| if n.GrafanaManagedAlert != nil { |
There was a problem hiding this comment.
I'm not sure this validation belong in Type, is there any particular reason for it? Otherwise, I'd be inclined for following the pattern throughout this file and creating a function called validate that we can use as we unmarshal.
There was a problem hiding this comment.
The only reason is that Type() and validate() will end up very similar but I will change it.
domasx2
approved these changes
Apr 14, 2021
gotjosh
reviewed
Apr 14, 2021
pkg/api/cortex-ruler.go
Outdated
| @@ -96,7 +96,8 @@ type NamespaceConfigResponse map[string][]GettableRuleGroupConfig | |||
|
|
|||
| // swagger:model | |||
| type PostableRuleGroupConfig struct { | |||
| Name string `yaml:"name" json:"name"` | |||
| Name string `yaml:"name" json:"name"` | |||
| // Example 1m | |||
There was a problem hiding this comment.
I'm not sure we need these changes here. The same applies for the RuleNode down below.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
GettableGrafanaRuleI had to:
extend model.Duration type to implement theThis is finally not required (JSON unmarshalling works without it) so I have revert it.json.Marshalerandjson.Unmarshalerinterfaces