Federated targets functionality #3350

2nick · 2020-10-21T15:20:21Z

I added CHANGELOG entry for this change.
Change is not relevant to the end user.

Changes

Adding federated targets functionality to query and sidecar.

Verification

There is some e2e tests.

yeya24

Amazing work!

test/e2e/targets_api_test.go

pkg/targets/targetspb/rpc.proto

pkg/targets/prometheus.go

pkg/query/storeset.go

yeya24 · 2020-10-21T16:47:19Z

Why .bingo/go.mod is changed from 755 to 644, is it related to this pr?

2nick · 2020-10-21T21:32:09Z

Why .bingo/go.mod is changed from 755 to 644, is it related to this pr?

No, this file is absolutely not related to this pr.

Don't know how it happened, but 644 looks more correct for it :)

Should I change it back to 755 and push?

…hanos-io#3350) Signed-off-by: Alexander Tunik <2braven@gmail.com>

2nick · 2020-10-22T20:03:11Z

@yeya24 comments fixed

Some e2e tests failed on my laptop too but second run was succeed - is there any known bug/reason for that behaviour?

Signed-off-by: Alexander Tunik <2braven@gmail.com> fix comments by PR review in code of federated targets functionality (thanos-io#3350) Signed-off-by: Alexander Tunik <2braven@gmail.com> Updating pkg/promclient Client.TargetsInGRPC to use new get2xxResultWithGRPCErrors method Signed-off-by: Alexander Tunik <2braven@gmail.com>

yeya24 · 2020-11-03T13:13:11Z

I will test this later. But generally, this pr looks good!

The only thing I am worried about is #2600.

bwplotka

I think that is very solid PR, I love it 🤗

I would be even close to approving it, but it's quite big to review in detail right now. Generally LGTM! 💪

We talked @yeya24 around #2600 and we can do this in another PR. I think this PR shows nicely what we can reuse 🤗

pkg/targets/proxy.go

yeya24 · 2020-11-04T13:51:40Z

Hi @2nick, is this still WIP?

bwplotka

This is very solid work, I love it 💪
Thanks.

LGTM, just super minor nits (:

go.mod

pkg/targets/proxy.go

pkg/targets/targetspb/rpc.proto

pkg/targets/proxy.go

cmd/thanos/query.go

pkg/api/query/v1.go

test/e2e/targets_api_test.go

GiedriusS

Solid work. Just a few minor nits and @bwplotka's comments are legit. Awesome work 💪

bwplotka · 2020-12-02T11:09:39Z

Any chances to do the last tiny steps @2nick so we can merge this? 🤗

cmd/thanos/query.go

squat

Looks pretty good! There are some small nits we could clean up

pkg/query/storeset.go

pkg/targets/proxy.go

pkg/api/query/v1.go

yeya24

This pr looks good to me.
Sorry I missed this pr and just merged the exemplars one. Would you mind doing another rebase?

2nick · 2021-03-30T16:42:33Z

@bwplotka any chance of being merged? 😄

yeya24

Would you mind updating the changelog? I think it is ready to merge.

Signed-off-by: Alexander Tunik <2braven@gmail.com>

2nick · 2021-03-31T11:40:58Z

@yeya24 added line to changelog.

Tired of those flaky e2e tests - is it possible to skip them?

yeya24 · 2021-03-31T13:17:49Z

@yeya24 added line to changelog.

Tired of those flaky e2e tests - is it possible to skip them?

Yeah, it is a flaky test. Let's skip that.

@bwplotka @squat Can you please give this pr a final look?

bwplotka

This SOLID work. Massive thanks for patience and high quality code. We should definitely have it merged much sooner, sorry for lag on our side. LGTM! 💪🏽

bwplotka · 2021-04-01T16:29:12Z

CHANGELOG.md

@@ -12,6 +12,8 @@ We use _breaking :warning:_ to mark changes that are not backward compatible (re

 ## Unreleased

+- [#3350](https://github.com/thanos-io/thanos/pull/3350) Query/Sidecar: Added targets API support. You can now configure you Querier to fetch Prometheus targets from leaf Prometheus-es!


Should be under # Added section I suppose? 🤗

Not a bigger, we can clean up later.

bwplotka · 2021-04-01T16:33:03Z

I restarted e2e job, let's wait until green (:

2nick changed the title ~~federated targets functionality (#1375)~~ WIP: federated targets functionality Oct 21, 2020

2nick force-pushed the federated-targets branch 3 times, most recently from 2f338c9 to f384750 Compare October 21, 2020 15:57

2nick mentioned this pull request Oct 21, 2020

querier: Federated Thanos Targets Page #1375

Closed

yeya24 reviewed Oct 21, 2020

View reviewed changes

test/e2e/targets_api_test.go Outdated Show resolved Hide resolved

pkg/targets/targetspb/rpc.proto Show resolved Hide resolved

pkg/targets/prometheus.go Outdated Show resolved Hide resolved

pkg/query/storeset.go Outdated Show resolved Hide resolved

2nick added a commit to 2nick/thanos that referenced this pull request Oct 22, 2020

fix comments by PR review in code of federated targets functionality (t…

86adf14

…hanos-io#3350) Signed-off-by: Alexander Tunik <2braven@gmail.com>

2nick force-pushed the federated-targets branch from bd2054d to 0316d64 Compare November 2, 2020 17:31

2nick requested a review from yeya24 November 3, 2020 09:34

yeya24 requested review from bwplotka, GiedriusS and kakkoyun November 3, 2020 13:13

bwplotka reviewed Nov 3, 2020

View reviewed changes

pkg/targets/proxy.go Show resolved Hide resolved

2nick changed the title ~~WIP: federated targets functionality~~ federated targets functionality Nov 4, 2020

2nick requested a review from bwplotka November 13, 2020 13:21

2nick force-pushed the federated-targets branch 2 times, most recently from d2782b4 to d9796e8 Compare November 17, 2020 21:30

bwplotka reviewed Nov 18, 2020

View reviewed changes

go.mod Outdated Show resolved Hide resolved

pkg/targets/proxy.go Show resolved Hide resolved

pkg/targets/targetspb/rpc.proto Show resolved Hide resolved

pkg/targets/proxy.go Show resolved Hide resolved

GiedriusS reviewed Nov 19, 2020

View reviewed changes

cmd/thanos/query.go Outdated Show resolved Hide resolved

GiedriusS reviewed Nov 19, 2020

View reviewed changes

pkg/api/query/v1.go Outdated Show resolved Hide resolved

GiedriusS reviewed Nov 19, 2020

View reviewed changes

test/e2e/targets_api_test.go Outdated Show resolved Hide resolved

GiedriusS approved these changes Nov 19, 2020

View reviewed changes

bwplotka changed the title ~~federated targets functionality~~ Federated targets functionality Dec 2, 2020

squat reviewed Mar 15, 2021

View reviewed changes

cmd/thanos/query.go Outdated Show resolved Hide resolved

squat reviewed Mar 15, 2021

View reviewed changes

pkg/query/storeset.go Outdated Show resolved Hide resolved

pkg/targets/proxy.go Outdated Show resolved Hide resolved

pkg/targets/proxy.go Outdated Show resolved Hide resolved

2nick force-pushed the federated-targets branch 3 times, most recently from abdb441 to 5578a59 Compare March 16, 2021 14:54

2nick requested review from squat and bwplotka March 16, 2021 15:08

yeya24 reviewed Mar 20, 2021

View reviewed changes

pkg/api/query/v1.go Outdated Show resolved Hide resolved

2nick force-pushed the federated-targets branch from 5578a59 to 2295ab4 Compare March 22, 2021 16:53

2nick requested a review from yeya24 March 22, 2021 16:54

2nick force-pushed the federated-targets branch from 2295ab4 to 31cb394 Compare March 22, 2021 18:25

yeya24 approved these changes Mar 22, 2021

View reviewed changes

2nick force-pushed the federated-targets branch 2 times, most recently from 12e2945 to 0db9145 Compare March 22, 2021 19:49

2nick force-pushed the federated-targets branch 3 times, most recently from 8b9e78e to edee39a Compare March 30, 2021 11:51

yeya24 approved these changes Mar 30, 2021

View reviewed changes

2nick force-pushed the federated-targets branch 3 times, most recently from 7542563 to ab6f27c Compare March 31, 2021 11:18

federated targets functionality (thanos-io#1375)

d15fe5b

Signed-off-by: Alexander Tunik <2braven@gmail.com>

2nick force-pushed the federated-targets branch from ab6f27c to d15fe5b Compare March 31, 2021 11:28

bwplotka approved these changes Apr 1, 2021

View reviewed changes

bwplotka enabled auto-merge (squash) April 1, 2021 16:33

bwplotka merged commit ea5104a into thanos-io:main Apr 1, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Federated targets functionality #3350

Federated targets functionality #3350

2nick commented Oct 21, 2020

yeya24 left a comment

yeya24 commented Oct 21, 2020

2nick commented Oct 21, 2020

2nick commented Oct 22, 2020

yeya24 commented Nov 3, 2020

bwplotka left a comment •

edited

Loading

yeya24 commented Nov 4, 2020

bwplotka left a comment

GiedriusS left a comment

bwplotka commented Dec 2, 2020

squat left a comment

yeya24 left a comment

2nick commented Mar 30, 2021

yeya24 left a comment

2nick commented Mar 31, 2021

yeya24 commented Mar 31, 2021

bwplotka left a comment

bwplotka Apr 1, 2021

bwplotka Apr 1, 2021

bwplotka commented Apr 1, 2021

		@@ -12,6 +12,8 @@ We use _breaking :warning:_ to mark changes that are not backward compatible (re

		## Unreleased

		- [#3350](https://github.com/thanos-io/thanos/pull/3350) Query/Sidecar: Added targets API support. You can now configure you Querier to fetch Prometheus targets from leaf Prometheus-es!

Federated targets functionality #3350

Federated targets functionality #3350

Conversation

2nick commented Oct 21, 2020

Changes

Verification

yeya24 left a comment

Choose a reason for hiding this comment

yeya24 commented Oct 21, 2020

2nick commented Oct 21, 2020

2nick commented Oct 22, 2020

yeya24 commented Nov 3, 2020

bwplotka left a comment • edited Loading

Choose a reason for hiding this comment

yeya24 commented Nov 4, 2020

bwplotka left a comment

Choose a reason for hiding this comment

GiedriusS left a comment

Choose a reason for hiding this comment

bwplotka commented Dec 2, 2020

squat left a comment

Choose a reason for hiding this comment

yeya24 left a comment

Choose a reason for hiding this comment

2nick commented Mar 30, 2021

yeya24 left a comment

Choose a reason for hiding this comment

2nick commented Mar 31, 2021

yeya24 commented Mar 31, 2021

bwplotka left a comment

Choose a reason for hiding this comment

bwplotka Apr 1, 2021

Choose a reason for hiding this comment

bwplotka Apr 1, 2021

Choose a reason for hiding this comment

bwplotka commented Apr 1, 2021

bwplotka left a comment •

edited

Loading