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.

Sign up for GitHub

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

Jump to bottom

Update Thanos to latest and use label matchers in LabelValues call. #4133

Merged
merged 8 commits into from
Apr 28, 2021
Merged

Update Thanos to latest and use label matchers in LabelValues call. #4133

merged 8 commits into from
Apr 28, 2021

Conversation

pstibrany
Copy link
Contributor

@pstibrany pstibrany commented Apr 27, 2021 •
edited
Loading

What this PR does: This PR updates Thanos to latest main to bring in thanos-io/thanos#4107. This PR also passes matchers to LabelValuesRequest sent to store gateways.

Checklist

  • [na] Tests updated
  • [na] Documentation added
  • [na] CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@pstibrany
Update Thanos to latest main.
b6a3aa8 
Signed-off-by: Peter Štibraný <[email protected]>
@pstibrany
Add matchers to LabelValuesRequest.
4047769 
Signed-off-by: Peter Štibraný <[email protected]>
@pstibrany pstibrany changed the title Update Thanos to latest main. Update Thanos to latest and use label matchers in LabelValues call. Apr 27, 2021
@pstibrany
Include matchers in the tests.
8fb2675 
Signed-off-by: Peter Štibraný <[email protected]>
simonswine
simonswine approved these changes Apr 27, 2021
View reviewed changes
Copy link
Contributor

@simonswine simonswine left a comment

Choose a reason for hiding this comment

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

LGTM

@pstibrany
Copy link
Contributor Author

Related to #3658 (only label values support added here. Label names is missing support in Prometheus storage.LabelQuerier interface still.

@pstibrany
CHANGELOG.md
8e82385 
Signed-off-by: Peter Štibraný <[email protected]>
@pstibrany
Move entry.
9e940b2 
Signed-off-by: Peter Štibraný <[email protected]>
@pstibrany
Clarify.
2776fa3 
Signed-off-by: Peter Štibraný <[email protected]>
@pstibrany pstibrany mentioned this pull request Apr 28, 2021
Closed
pracucci
pracucci reviewed Apr 28, 2021
View reviewed changes
Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

Oh that was easy! LGTM!

Thanos changes LGTM (they basically only contain your PR).

Side note: would be great to have at least a test on this, but we can do it in a follow-up PR once the Label Names API will be addressed too.

@pstibrany
Copy link
Contributor Author

pstibrany commented Apr 28, 2021 •
edited
Loading

Side note: would be great to have at least a test on this, but we can do it in a follow-up PR once the Label Names API will be addressed too.

Added testing of matchers into existing integration tests. At the moment Label Names API is not important for work I'm doing, so I will let that one be for now, as it requires more changes across Prometheus, Thanos and Cortex.

@pracucci
Copy link
Contributor

Added testing of matchers into existing integration tests.

LGTM, thanks!

@pstibrany pstibrany enabled auto-merge (squash) April 28, 2021 13:28
@pstibrany pstibrany merged commit 13efec0 into cortexproject:master Apr 28, 2021
@pstibrany pstibrany deleted the upgrade-thanos branch April 28, 2021 14:58
@pracucci pracucci mentioned this pull request Jul 22, 2021
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pracucci pracucci pracucci approved these changes

@simonswine simonswine simonswine approved these changes

Assignees
No one assigned
Labels
size/M
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pstibrany @pracucci @simonswine