Skip to content

Fix for alertmanagers not configuring users before becoming ACTIVE. #4110

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Apr 23, 2021
Merged

Fix for alertmanagers not configuring users before becoming ACTIVE. #4110

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8065b0f
Fix for alertmanagers not configuring users before becoming ACTIVE.
stevesg Apr 23, 2021
e288417
Fix race condition in unit test.
stevesg Apr 23, 2021
e9a733d
Review comments.
stevesg Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/alertmanager/alertmanager_ring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ var RingOp = ring.NewOp([]ring.InstanceState{ring.ACTIVE}, func(s ring.InstanceS
return s != ring.ACTIVE
})

// UserOwnedRingOp is the operation used for checking if a user is owned by an alertmanager.
var UserOwnedRingOp = ring.NewOp([]ring.InstanceState{ring.ACTIVE, ring.JOINING}, func(s ring.InstanceState) bool {
// A user is owned by an alertmanager in both ACTIVE and JOINING states.
return (s != ring.ACTIVE && s != ring.JOINING)
})

// RingConfig masks the ring lifecycler config which contains
// many options not really required by the alertmanager ring. This config
// is used to strip down the config to the minimum, and avoid confusion
Expand Down
2 changes: 1 addition & 1 deletion pkg/alertmanager/multitenant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ func (am *MultitenantAlertmanager) isUserOwned(userID string) bool {
return true
}

alertmanagers, err := am.ring.Get(shardByUser(userID), RingOp, nil, nil, nil)
alertmanagers, err := am.ring.Get(shardByUser(userID), UserOwnedRingOp, nil, nil, nil)
if err != nil {
am.ringCheckErrors.Inc()
level.Error(am.logger).Log("msg", "failed to load alertmanager configuration", "user", userID, "err", err)
Expand Down