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 incl MemPostings improvements #8327

Merged

Conversation

colega
Copy link
Contributor

@colega colega commented Jun 10, 2024

What this PR does

Updates mimir-promteheus to bring changes from:

Which issue(s) this PR fixes or relates to

Fixes an internal issue.

Checklist

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

Updating to bring changes from:
- prometheus/prometheus#13286
- prometheus/prometheus#14286

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
@colega colega force-pushed the update-mimir-prometheus-to-incl-mempostings-lock-improvements branch from e11be5b to b437df6 Compare June 10, 2024 17:34
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
@colega colega marked this pull request as ready for review June 10, 2024 17:36
@colega colega requested review from stevesg, grafanabot and a team as code owners June 10, 2024 17:36
Copy link
Contributor

@gotjosh gotjosh left a comment

Choose a reason for hiding this comment

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

LGTM

@colega colega enabled auto-merge (squash) June 10, 2024 17:41
@colega colega merged commit 6cc0bf7 into main Jun 10, 2024
35 checks passed
@colega colega deleted the update-mimir-prometheus-to-incl-mempostings-lock-improvements branch June 10, 2024 18:00
@grafanabot
Copy link
Contributor

The backport to r292 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-8327-to-r292 origin/r292
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 6cc0bf7bcb7c6909501a5ec5958ec3cdc0f29dd6
# Push it to GitHub
git push --set-upstream origin backport-8327-to-r292
git switch main
# Remove the local backport branch
git branch -D backport-8327-to-r292

Then, create a pull request where the base branch is r292 and the compare/head branch is backport-8327-to-r292.

@grafanabot
Copy link
Contributor

The backport to r291 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-8327-to-r291 origin/r291
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 6cc0bf7bcb7c6909501a5ec5958ec3cdc0f29dd6
# Push it to GitHub
git push --set-upstream origin backport-8327-to-r291
git switch main
# Remove the local backport branch
git branch -D backport-8327-to-r291

Then, create a pull request where the base branch is r291 and the compare/head branch is backport-8327-to-r291.

@grafanabot
Copy link
Contributor

The backport to r293 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-8327-to-r293 origin/r293
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 6cc0bf7bcb7c6909501a5ec5958ec3cdc0f29dd6
# Push it to GitHub
git push --set-upstream origin backport-8327-to-r293
git switch main
# Remove the local backport branch
git branch -D backport-8327-to-r293

Then, create a pull request where the base branch is r293 and the compare/head branch is backport-8327-to-r293.

@grafanabot
Copy link
Contributor

The backport to r294 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-8327-to-r294 origin/r294
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 6cc0bf7bcb7c6909501a5ec5958ec3cdc0f29dd6
# Push it to GitHub
git push --set-upstream origin backport-8327-to-r294
git switch main
# Remove the local backport branch
git branch -D backport-8327-to-r294

Then, create a pull request where the base branch is r294 and the compare/head branch is backport-8327-to-r294.

@colega
Copy link
Contributor Author

colega commented Jun 11, 2024

I will not merge this backports, I'll create mimir-prometheus branches instead, as they're likely starting from different versions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants