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

upgrade thanos to latest main and update Prometheus #6267

Merged
merged 1 commit into from
Oct 15, 2024

Conversation

yeya24
Copy link
Contributor

@yeya24 yeya24 commented Oct 14, 2024

What this PR does:

Update Thanos to thanos-io/thanos#7813 and Prometheus accordingly.

Which issue(s) this PR fixes:
Fixes #

Checklist

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

Signed-off-by: Ben Ye <benye@amazon.com>
@dosubot dosubot bot added dependencies Pull requests that update a dependency file go Pull requests that update Go code labels Oct 14, 2024
@yeya24
Copy link
Contributor Author

yeya24 commented Oct 14, 2024

Hey @harry671003, can you please help review this change when you have time? There are some changes related to the labels API limit.

Copy link
Contributor

@harry671003 harry671003 left a comment

Choose a reason for hiding this comment

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

LGTM!
I only looked at pkg/ changes.

@harry671003
Copy link
Contributor

Prometheus is from a month ago. prometheus/prometheus@6f0d6038b7f9
Are we still blocked on the Thanos PromQL engine update for latest Prometheus?

@yeya24
Copy link
Contributor Author

yeya24 commented Oct 15, 2024

@harry671003 IIUC we are still blocked as it doesn't have prometheus/prometheus@debbdb8#diff-ad2761bb162a2f12326b18f2714ef54f4cd476cfe3388f77b2b20c5ff82e4faaR899.

Update to the current commit to pull some of the upstream changes for now. We still need to resolve the issue on Thanos promql engine side.

@yeya24 yeya24 requested a review from alanprot October 15, 2024 14:54
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Oct 15, 2024
@yeya24 yeya24 merged commit c6347f0 into cortexproject:master Oct 15, 2024
16 checks passed
@yeya24 yeya24 deleted the upgrade-prometheus-and-thano branch October 21, 2024 19:39
@yeya24 yeya24 mentioned this pull request Oct 23, 2024
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file go Pull requests that update Go code lgtm This PR has been approved by a maintainer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants