Added Ruler support for RulesAPI; Refactored Manager. #2562
Conversation
|
looking great so far! |
bwplotka
force-pushed
the
ruler-rulesAPI
branch
2 times, most recently
from
6c1ba3e
to
f891f6a
Compare
bwplotka
force-pushed
the
ruler-rulesAPI
branch
6 times, most recently
from
c72d4f7
to
8fa2a4b
Compare
|
@bwplotka ping :-) can we merge once tests are fixed, i'd love to rebase on these changes 💚 |
|
@s-urbaniak It's not as easy as it looks. I changed Prometheus version, so all deps will be reinstalled on CI causing major slowdown. We need to update CI but in mean time Go version changed on master.. 🤦 Plus I am fixing other things, Now. I would propose following: Since we have approval on design, let's merge CURRENT feature branch to master (or rather. propose a PR first). Let's rebase / pull latest master as well. Can we do it? 🤗 With this it would be easier for me to rebase my PRs on this (since this is actually chained with #2558 (!), then fix tests, once we have Go version. Ideally we could merge feature branch now and iterate on master from now! (: |
|
That would be a question for the remaining maintainers I guess, fine from my side, but I don't know what the policy is regarding master feature consistency. |
|
So far things can be in progress. E.g see the receiver work. It was done on master. |
|
As long as our new flags are hidden |
|
But yea, let's just rebase/ pull master to feature branch anyway =D |
|
I'm fine with merging things in steps as long as the flags are hidden until the feature is done and out of experimental. |
bwplotka
force-pushed
the
ruler
branch
4 times, most recently
from
3318116
to
7cdd6c3
Compare
bwplotka
force-pushed
the
ruler-rulesAPI
branch
2 times, most recently
from
77269f6
to
ca75efb
Compare
|
Should be good to go @s-urbaniak |
|
lgtm modulo the tests! 💚 |
bwplotka
force-pushed
the
ruler-rulesAPI
branch
7 times, most recently
from
8eba0fd
to
8d4e9dd
Compare
As per: https://thanos.io/proposals/202003_thanos_rules_federation.md/ Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
|
Looks like there is some deduplication bug, but you totally rewrote this in next PR: #2555 So I am skipping TestRulesAPI_Fanout test here. Let's enable on feature branch. |
As per: https://thanos.io/proposals/202003_thanos_rules_federation.md/ Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
) * 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>
As per: https://thanos.io/proposals/202003_thanos_rules_federation.md/
Signed-off-by: Bartlomiej Plotka bwplotka@gmail.com
cc @s-urbaniak