fix: alertmanager user config disappearing when ring is unreachable #7372
Merged
friedrichg merged 6 commits intocortexproject:masterfrom Mar 27, 2026
Merged
fix: alertmanager user config disappearing when ring is unreachable #7372friedrichg merged 6 commits intocortexproject:masterfrom
friedrichg merged 6 commits intocortexproject:masterfrom
Conversation
…reachable Signed-off-by: Kishore K G <kishorekg@google.com>
Signed-off-by: Kishore K G <kishorekg@google.com>
Signed-off-by: Kishore K G <kishorekg@google.com>
Signed-off-by: Kishore K G <kishorekg@google.com>
Signed-off-by: kishorekg1999 <kishorekg@google.com>
Contributor
Author
|
@SungJin1212 @CharlieTLe @friedrichg can you please review the PR when you get a chance ? Thanks in advance ! |
SungJin1212
approved these changes
Mar 26, 2026
Member
SungJin1212
left a comment
SungJin1212
left a comment
There was a problem hiding this comment.
Code is LGTM, I left just one nit.
Signed-off-by: kishorekg1999 <kishorekg.github@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does:
if the Cortex ring was temporarily unreachable, isUserOwned() incorrectly returned false instead of an error. This caused the loadAlertmanagerConfigs() to assume it no longer owned the user, triggering local config deletion and deleting the user's config from store - code ref.
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]