Use proto rules API instead of struct; Moved as much as possible to promclient; Added rulesAPI RPC to sidecar. by bwplotka · Pull Request #2243 · thanos-io/thanos

bwplotka · 2020-03-10T10:12:27Z

Signed-off-by: Bartlomiej Plotka bwplotka@gmail.com

cc @s-urbaniak

bwplotka · 2020-03-10T19:05:07Z

This should be ready to go @s-urbaniak!

bwplotka · 2020-03-10T19:05:10Z

PTAL

yeya24 · 2020-03-11T02:20:31Z

pkg/promclient/promclient.go

+		return nil, errors.Wrap(err, "invalid matchers")
 	}
-	defer runutil.ExhaustCloseWithLogOnErr(logger, resp.Body, "metrics body")
+	fmt.Println(matcher)


Remove this?

s-urbaniak · 2020-03-11T11:19:50Z

pkg/promclient/promclient.go

+	body, _, err := c.get2xx(ctx, &u)
 	if err != nil {
-		return nil, nil, errors.Wrapf(err, "perform GET request against %s", u.String())
+		return nil, nil, err


no wrapping is necessary any more?

TODO: Use with Stack on command error.

Fatalf("%+v", err)

pkg/errors

s-urbaniak · 2020-03-11T11:22:38Z

wow, this is huge 😲
i am a bit overwhelmed, but i see RulesServer now being registered, so i am super happy 🎉 😊

bwplotka · 2020-03-11T11:45:30Z

Happy to have a quick pair-review @s-urbaniak if needed

bwplotka · 2020-03-11T12:53:46Z

pkg/promclient/promclient.go

+	body, _, err := c.get2xx(ctx, &u)
 	if err != nil {
-		return nil, nil, errors.Wrapf(err, "perform GET request against %s", u.String())
+		return nil, nil, err


TODO: Use with Stack on command error.

bwplotka · 2020-03-11T12:54:39Z

pkg/promclient/promclient.go

+	body, _, err := c.get2xx(ctx, &u)
 	if err != nil {
-		return nil, nil, errors.Wrapf(err, "perform GET request against %s", u.String())
+		return nil, nil, err


Fatalf("%+v", err)

pkg/errors

bwplotka · 2020-03-11T13:00:15Z

pkg/testutil/testpromcompatibility/api_compatibility.go

+	PartialResponseStrategy string `json:"partialResponseStrategy"`
+}
+
+type AlertingRule struct {


Upstream make it public?

s-urbaniak · 2020-03-11T13:22:48Z

lgtm 👍

s-urbaniak · 2020-03-13T12:36:33Z

looking at the CI failure 👀

s-urbaniak · 2020-03-13T14:11:13Z

yay, I can repro locally, let me try to fix this so I'll learn 👷‍♂️

bwplotka · 2020-03-16T18:05:33Z

Are you on it @s-urbaniak ? If not, I can fix

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

bwplotka · 2020-03-16T18:51:17Z

Fixed hopefully.

s-urbaniak · 2020-03-17T09:19:59Z

@bwplotka i was on it, but my fix was related to the test itself, i will continue from here for the remaining failures.

…romclient; 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>

bwplotka · 2020-03-19T11:57:41Z

Thanks @s-urbaniak for help!

Let's move it forward.

We still need:

e2e tests
proxy implementation
ruler implementation

s-urbaniak · 2020-03-19T12:04:22Z

@bwplotka on it 👍

…romclient; 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>

) * 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>

bwplotka changed the title ~~Use proto rules API instead of struct; Added rulesAPI RPC to sidecar.~~ Use proto rules API instead of struct; Moved as much as possible to promclient; Added rulesAPI RPC to sidecar. Mar 10, 2020

bwplotka mentioned this pull request Mar 10, 2020

Moved prometheus client API to promclient; Added sidecar RuleAPI implementation. Added entry for e2e. #2236

Closed

bwplotka force-pushed the api-on-proto branch 2 times, most recently from 299c29d to bac1909 Compare March 10, 2020 19:04

bwplotka requested review from GiedriusS, squat and yeya24 March 10, 2020 19:05

yeya24 reviewed Mar 11, 2020

View reviewed changes

bwplotka force-pushed the api-on-proto branch 2 times, most recently from ff9d8a7 to ac89485 Compare March 11, 2020 11:14

s-urbaniak reviewed Mar 11, 2020

View reviewed changes

bwplotka force-pushed the api-on-proto branch 2 times, most recently from 7616456 to 5d0c93f Compare March 11, 2020 12:44

bwplotka commented Mar 11, 2020

View reviewed changes

bwplotka added 2 commits March 16, 2020 18:49

Use proto rules API instead of struct; Added rulesAPI RPC to sidecar.

2dc375b

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

Fixed broken test.

1227553

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

bwplotka force-pushed the api-on-proto branch from 5d0c93f to 1227553 Compare March 16, 2020 18:51

s-urbaniak mentioned this pull request Mar 19, 2020

Use proto rules API instead of struct; Moved as much as possible to promclient; Added rulesAPI RPC to sidecar. #2291

Merged

bwplotka merged commit 932f2ee into features/rules-proxy Mar 19, 2020

bwplotka deleted the api-on-proto branch March 19, 2020 11:57

Conversation

bwplotka commented Mar 10, 2020

Uh oh!

bwplotka commented Mar 10, 2020

Uh oh!

bwplotka commented Mar 10, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

s-urbaniak commented Mar 11, 2020

Uh oh!

bwplotka commented Mar 11, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

s-urbaniak commented Mar 11, 2020

Uh oh!

s-urbaniak commented Mar 13, 2020

Uh oh!

s-urbaniak commented Mar 13, 2020

Uh oh!

bwplotka commented Mar 16, 2020

Uh oh!

bwplotka commented Mar 16, 2020

Uh oh!

s-urbaniak commented Mar 17, 2020

Uh oh!

bwplotka commented Mar 19, 2020

Uh oh!

s-urbaniak commented Mar 19, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants