Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged Experimental Federated Rules API feature branch to master. #2200

Merged
merged 11 commits into from May 25, 2020

Conversation

bwplotka
Copy link
Member

@bwplotka bwplotka commented Feb 28, 2020

Branch for Federated Rule API with @s-urbaniak based on following design

pkg/store/storepb/rpc.proto Outdated Show resolved Hide resolved
pkg/store/storepb/rpc.proto Outdated Show resolved Hide resolved
@stale
Copy link

stale bot commented Apr 18, 2020

This issue/PR has been automatically marked as stale because it has not had recent activity. Please comment on status otherwise the issue will be closed in a week. Thank you for your contributions.

@stale stale bot added the stale label Apr 18, 2020
@stale stale bot closed this Apr 25, 2020
@bwplotka bwplotka reopened this Apr 27, 2020
@stale stale bot removed the stale label Apr 27, 2020
@bwplotka bwplotka changed the title feature branch: Federated Rules API via RuleAPI Merged Experimental Federated Rules API feature branch to master. May 21, 2020
@bwplotka
Copy link
Member Author

Ok, here we go!

We are ready to merge rules to master!

All flags are hidden for now.

The only missing bit is improved deduplication which can be done separately to the master: #2555

@bwplotka bwplotka marked this pull request as ready for review May 21, 2020 15:08
bwplotka and others added 5 commits May 21, 2020 16:38
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
* 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>
…oto). Added tests. (#2242)

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
@bwplotka
Copy link
Member Author

bwplotka commented May 22, 2020

Ok I hate master pulls, doing full rebase, fasten the belt!

bwplotka and others added 3 commits May 22, 2020 09:01
…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>
* 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 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>
@bwplotka
Copy link
Member Author

bwplotka commented May 22, 2020

Now it should be good to go, just probably tests to fix. 💪

PTAL @povilasv @GiedriusS @s-urbaniak

ALL of the commits were reviewed and approved before, just last one + rebase could mess something up (:

@bwplotka bwplotka force-pushed the features/rules-proxy branch 3 times, most recently from 714ac05 to 5f29313 Compare May 22, 2020 15:55
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
@bwplotka
Copy link
Member Author

(:

@s-urbaniak
Copy link
Contributor

yay, thank you! 🎉
lgtm from my side ;-)

Copy link
Member

@brancz brancz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Going to go ahead and merge this as previously things had already been reviewed and merged into the feature branch, and the functionality is hidden for now.

@brancz brancz merged commit c733564 into master May 25, 2020
simonpasquier added a commit to simonpasquier/thanos that referenced this pull request Aug 28, 2020
This bug was already fixed in thanos-io#2615
but it got lost when we merged
thanos-io#2200.

Co-authored-by: johncming <johncming@yahoo.com>
Co-authored-by: Lili Cosic <cosiclili@gmail.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
simonpasquier added a commit to simonpasquier/thanos that referenced this pull request Aug 28, 2020
This bug was already fixed in thanos-io#2615
but it got lost when we merged
thanos-io#2200.

Co-authored-by: johncming <johncming@yahoo.com>
Co-authored-by: Lili Cosic <cosiclili@gmail.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
bwplotka pushed a commit that referenced this pull request Aug 28, 2020
This bug was already fixed in #2615
but it got lost when we merged
#2200.

Co-authored-by: johncming <johncming@yahoo.com>
Co-authored-by: Lili Cosic <cosiclili@gmail.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>

Co-authored-by: johncming <johncming@yahoo.com>
Co-authored-by: Lili Cosic <cosiclili@gmail.com>
kakkoyun pushed a commit to kakkoyun/thanos that referenced this pull request Sep 7, 2020
This bug was already fixed in thanos-io#2615
but it got lost when we merged
thanos-io#2200.

Co-authored-by: johncming <johncming@yahoo.com>
Co-authored-by: Lili Cosic <cosiclili@gmail.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>

Co-authored-by: johncming <johncming@yahoo.com>
Co-authored-by: Lili Cosic <cosiclili@gmail.com>
kakkoyun pushed a commit to kakkoyun/thanos that referenced this pull request Sep 7, 2020
This bug was already fixed in thanos-io#2615
but it got lost when we merged
thanos-io#2200.

Co-authored-by: johncming <johncming@yahoo.com>
Co-authored-by: Lili Cosic <cosiclili@gmail.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>

Co-authored-by: johncming <johncming@yahoo.com>
Co-authored-by: Lili Cosic <cosiclili@gmail.com>
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
kakkoyun added a commit that referenced this pull request Sep 7, 2020
* Made sure old sse S3 option if specified, produces error.

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

* Cut v0.15.0-rc.0

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

* tsdbstore: Optimized response framing if iterator finished.

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

* Apply suggestions from code review

Co-authored-by: Krasimir Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Rule: update manager when all rule files are removed (#3095)

This bug was already fixed in #2615
but it got lost when we merged
#2200.

Co-authored-by: johncming <johncming@yahoo.com>
Co-authored-by: Lili Cosic <cosiclili@gmail.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>

Co-authored-by: johncming <johncming@yahoo.com>
Co-authored-by: Lili Cosic <cosiclili@gmail.com>
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* ui: Fix Block Viewer for Compactor and Store (#3098)

* ui: Fix Block viewer for Compactor and Store

Signed-off-by: Prem Kumar <prmsrswt@gmail.com>

* Add an entry in CHANGELOG.md

Signed-off-by: Prem Kumar <prmsrswt@gmail.com>

* ui: react: Fixed tests for Blocks

Signed-off-by: Prem Kumar <prmsrswt@gmail.com>
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* querier: Fix overwriting maxSourceResolution when auto downsampling is enabled (#3105)

* Fix overwriting maxSourceResolution when auto downsampling is enabled

Signed-off-by: Ben Ye <yb532204897@gmail.com>

* add changelog

Signed-off-by: Ben Ye <yb532204897@gmail.com>
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Author: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com> Date:   Thu Aug 27 14:10:19 2020 +0300 (#3010)

Make the PromQL lookBack configurable with a flag

Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Cut release v0.15.0-rc.1 (#3103)

* Cut release v0.15.0-rc.1

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Address review issues

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Fix changelog

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Cut release v0.15.0 (#3129)

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Minor fix

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Address review comments

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
Co-authored-by: Krasimir Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
Co-authored-by: Simon Pasquier <spasquie@redhat.com>
Co-authored-by: johncming <johncming@yahoo.com>
Co-authored-by: Lili Cosic <cosiclili@gmail.com>
Co-authored-by: Prem Kumar <prmsrswt@gmail.com>
Co-authored-by: Ben Ye <yb532204897@gmail.com>
brancz pushed a commit to brancz/objstore that referenced this pull request Jan 28, 2022
* Made sure old sse S3 option if specified, produces error.

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

* Cut v0.15.0-rc.0

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

* tsdbstore: Optimized response framing if iterator finished.

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

* Apply suggestions from code review

Co-authored-by: Krasimir Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Rule: update manager when all rule files are removed (#3095)

This bug was already fixed in thanos-io/thanos#2615
but it got lost when we merged
thanos-io/thanos#2200.

Co-authored-by: johncming <johncming@yahoo.com>
Co-authored-by: Lili Cosic <cosiclili@gmail.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>

Co-authored-by: johncming <johncming@yahoo.com>
Co-authored-by: Lili Cosic <cosiclili@gmail.com>
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* ui: Fix Block Viewer for Compactor and Store (#3098)

* ui: Fix Block viewer for Compactor and Store

Signed-off-by: Prem Kumar <prmsrswt@gmail.com>

* Add an entry in CHANGELOG.md

Signed-off-by: Prem Kumar <prmsrswt@gmail.com>

* ui: react: Fixed tests for Blocks

Signed-off-by: Prem Kumar <prmsrswt@gmail.com>
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* querier: Fix overwriting maxSourceResolution when auto downsampling is enabled (#3105)

* Fix overwriting maxSourceResolution when auto downsampling is enabled

Signed-off-by: Ben Ye <yb532204897@gmail.com>

* add changelog

Signed-off-by: Ben Ye <yb532204897@gmail.com>
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Author: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com> Date:   Thu Aug 27 14:10:19 2020 +0300 (#3010)

Make the PromQL lookBack configurable with a flag

Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Cut release v0.15.0-rc.1 (#3103)

* Cut release v0.15.0-rc.1

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Address review issues

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Fix changelog

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Cut release v0.15.0 (#3129)

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Minor fix

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Address review comments

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
Co-authored-by: Krasimir Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
Co-authored-by: Simon Pasquier <spasquie@redhat.com>
Co-authored-by: johncming <johncming@yahoo.com>
Co-authored-by: Lili Cosic <cosiclili@gmail.com>
Co-authored-by: Prem Kumar <prmsrswt@gmail.com>
Co-authored-by: Ben Ye <yb532204897@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants