Refactored proto generation and separated store from rules APIs. #2558
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
|
lgtm 👍 |
bwplotka
force-pushed
the
ruler
branch
4 times, most recently
from
fc08fdc to
23b9d02
Compare
|
With this we separated rules and store APIs and servers into different directories 🤗
|
|
Giving time for others to review this. @s-urbaniak let's build up on top of this PR (: |
GiedriusS
reviewed
May 5, 2020
| srv := &rulesServer{ctx: ctx} | ||
| err = promRules.Rules(&rulespb.RulesRequest{}, srv) | ||
| if tcase.expectedErr != nil { | ||
| testutil.NotOk(t, err) |
There was a problem hiding this comment.
Minor thing but this is unnecessary since we check for equality on the next line and tcase.expectedErr is guaranteed not to be nil. BTW, great test 😄
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
|
All addressed and rebased, please PTAL @s-urbaniak |
bwplotka
force-pushed
the
ruler
branch
2 times, most recently
from
26e40f2 to
3318116
Compare
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
s-urbaniak
reviewed
May 20, 2020
s-urbaniak
reviewed
May 20, 2020
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
|
done @s-urbaniak |
s-urbaniak
reviewed
May 20, 2020
| @@ -1,7 +1,7 @@ | |||
| // Copyright (c) The Thanos Authors. | |||
| // Licensed under the Apache License 2.0. | |||
|
|
|||
| package thanosrule | |||
| package manager | |||
There was a problem hiding this comment.
i wonder if we can name this more concrete. This implementation "manages" rule files, correct? Maybe even rules/file makes more sense here then? The struct file.Manager could stay, stating that it is "managing" those rule files.
There was a problem hiding this comment.
maybe but TBH it's mainly a manager that groups Prom ones.
There was a problem hiding this comment.
actually we change this in next PR ;p so let's merge
|
just naming nits, else lgtm 👍 |
bwplotka
added a commit
that referenced
this pull request
May 22, 2020
* Refactored proto generation and separate store from rules APIs. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Addressed comments. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Fixed proto gen. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Addressed Serg comments. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
brancz
pushed a commit
that referenced
this pull request
May 25, 2020
) * Added RulesAPI. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Added warnings. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Added Type to rules requests as it is on HTTP API. (#2201) Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * pkg/store/storepb: fix wrong rule reference (#2237) * pkg/store/storepb: fix wrong rule reference Currently we recursively reference rules instead of recording rules. Signed-off-by: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com> * proto: regenerate Signed-off-by: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com> * Made storepb.RuleGroups a source of truth for rules API (Go, JSON, proto). Added tests. (#2242) Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Use proto rules API instead of struct; Moved as much as possible to promclient; Added rulesAPI RPC to sidecar. (#2243) * Use proto rules API instead of struct; Added rulesAPI RPC to sidecar. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Fixed broken test. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Use proto rules API instead of struct; Moved as much as possible to promclient; Added rulesAPI RPC to sidecar. (#2291) * rules_custom_test: fix asserting labels Signed-off-by: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com> * TestPrometheusStore_Rules_e2e: fix test fixture Signed-off-by: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com> Co-authored-by: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com> * cmd/thanos/query: add initial rules support (#2240) * cmd/thanos/query: add initial rules support Signed-off-by: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com> * pkg/query/api/v1: initial implementation Signed-off-by: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com> * e2e: initial implementation and fixes Signed-off-by: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com> * pkg/query: fix racy access to assert rules API store Signed-off-by: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com> * Refactored proto generation and separated store from rules APIs. (#2558) * Refactored proto generation and separate store from rules APIs. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Addressed comments. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Fixed proto gen. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Addressed Serg comments. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Added Ruler support for RulesAPI; Refactored Manager. (#2562) As per: https://thanos.io/proposals/202003_thanos_rules_federation.md/ Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Small fixes to changelog and flags. Do not add any. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Fixed after rebase. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> Co-authored-by: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
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.
Just refactor, no logic was changed.
NOTE: This is major change to how we build our photos (: ( I think good one, thanks for this we can import and reuse things, while maintaining different Go packages.
cc @s-urbaniak
Signed-off-by: Bartlomiej Plotka bwplotka@gmail.com