diff --git a/internal/app/statestore/alerts.go b/internal/app/statestore/alerts.go index 6b4797092..81a91bf70 100644 --- a/internal/app/statestore/alerts.go +++ b/internal/app/statestore/alerts.go @@ -124,8 +124,14 @@ func (b *server) checkServices(ctx context.Context, reporter alert.Reporter, rec mesh := presence.Mesh(list, now) down := watch.unhealthy(mesh, now) for _, service := range mesh { - if slices.Contains(presence.Services(), service.Service) { - reporter.Sync(ctx, slices.Contains(down, service.Service), serviceAlert(service.Service)) + if !slices.Contains(presence.Services(), service.Service) { + continue + } + // An unhealthy service still inside its grace leaves an open alert + // alone, so a restart of this store never resolves what it has raised. + raise := slices.Contains(down, service.Service) + if raise || service.State == presence.StateUp { + reporter.Sync(ctx, raise, serviceAlert(service.Service)) } } }