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

temporary fix for the ruler joining the ingester ring #4968

Merged
merged 1 commit into from
Jan 4, 2022
Merged

Conversation

trevorwhitney
Copy link
Collaborator

What this PR does / why we need it:
Temporary fix until grafana/dskit#101 is merged.

Which issue(s) this PR fixes:
Fixes #4967

Checklist

  • Documentation added
  • Tests updated
  • Add an entry in the CHANGELOG.md about the changes.

Copy link
Collaborator

@slim-bean slim-bean left a comment

Choose a reason for hiding this comment

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

LGTM

@owen-d owen-d merged commit acbbe4d into main Jan 4, 2022
@owen-d owen-d deleted the fix-ruler-ring branch January 4, 2022 15:09
@grafanabot
Copy link
Collaborator

The backport to release-2.4.1 failed:

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

To backport manually, run these commands in your terminal:

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

Then, create a pull request where the base branch is release-2.4.1 and the compare/head branch is backport-4968-to-release-2.4.1.

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

Successfully merging this pull request may close these issues.

Ruler registers with ingester ring when using the common ring config
4 participants