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

Update mimir-prometheus to 19bfb1e6e195 #1734

Merged
merged 1 commit into from Apr 22, 2022
Merged

Update mimir-prometheus to 19bfb1e6e195 #1734

merged 1 commit into from Apr 22, 2022

Conversation

colega
Copy link
Contributor

@colega colega commented Apr 20, 2022

What this PR does

This updates mimir-prometheus, including the bugfix from Prometheus:

prometheus/prometheus#10607

Which issue(s) this PR fixes or relates to

N/A

Checklist

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

@osg-grafana
Copy link
Contributor

@colega any need for a doc review on any of these bits? If so, lemme know. :)

@colega
Copy link
Contributor Author

colega commented Apr 21, 2022

@osg-grafana thanks, I think no docs change is needed. Plus this is blocked by #1695

@pracucci
Copy link
Collaborator

@colega I just merged #1695. Could you rebase, please? I would like to begin reviewing this PR too.

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
@colega colega marked this pull request as ready for review April 22, 2022 09:01
@colega colega changed the title Update mimir-prometheus Update mimir-prometheus to 19bfb1e6e195 Apr 22, 2022
@colega
Copy link
Contributor Author

colega commented Apr 22, 2022

Done, now it's definitely much easier.

Copy link
Collaborator

@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.

It basically only contains prometheus/prometheus#10607 so LGTM!

@pracucci pracucci enabled auto-merge (squash) April 22, 2022 09:07
@pracucci pracucci merged commit 8bce7f8 into main Apr 22, 2022
@pracucci pracucci deleted the update-prometheus branch April 22, 2022 09:10
@pstibrany
Copy link
Member

This PR actually fixed #1537, and has been released as part of Mimir 2.1.0. CHANGELOG entry is missing.

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