IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix potential panic in Alertmanager when starting up (#36562)

Browse Source 
* Alerting: Fix potential panic in Alertmanager when starting up

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix reviews

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
This commit is contained in:
Ganesh Vernekar
2021-07-12 11:15:16 +05:30
committed by GitHub
parent afff7f24fc
commit e19c690426
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/ngalert/api/api_alertmanager.go
View File

@@ -153,6 +153,9 @@ func (srv AlertmanagerSrv) RouteGetAMAlerts(c *models.ReqContext) response.Respo
if errors.Is(err, notifier.ErrGetAlertsBadPayload) { if errors.Is(err, notifier.ErrGetAlertsBadPayload) {
return ErrResp(http.StatusBadRequest, err, "") return ErrResp(http.StatusBadRequest, err, "")
} }
if errors.Is(err, notifier.ErrGetAlertsUnavailable) {
return ErrResp(http.StatusServiceUnavailable, err, "")
}
// any other error here should be an unexpected failure and thus an internal error // any other error here should be an unexpected failure and thus an internal error
return ErrResp(http.StatusInternalServerError, err, "") return ErrResp(http.StatusInternalServerError, err, "")
} }

12
pkg/services/ngalert/notifier/alertmanager.go
View File

@@ -104,6 +104,8 @@ type Alertmanager struct {
reloadConfigMtx sync.RWMutex reloadConfigMtx sync.RWMutex
config []byte config []byte
initialised bool
} }
func New(cfg *setting.Cfg, store store.AlertingStore, m *metrics.Metrics) (*Alertmanager, error) { func New(cfg *setting.Cfg, store store.AlertingStore, m *metrics.Metrics) (*Alertmanager, error) {
@@ -269,7 +271,15 @@ func (am *Alertmanager) SyncAndApplyConfigFromDatabase() error {
// applyConfig applies a new configuration by re-initializing all components using the configuration provided. // applyConfig applies a new configuration by re-initializing all components using the configuration provided.
// It is not safe to call concurrently. // It is not safe to call concurrently.
func (am *Alertmanager) applyConfig(cfg *apimodels.PostableUserConfig, rawConfig []byte) error { func (am *Alertmanager) applyConfig(cfg *apimodels.PostableUserConfig, rawConfig []byte) (err error) {
defer func() {
if err == nil {
// We consider AM as initialised only when the config has been
// applied at least once successfully. Until then, some objects
// can still be nil.
am.initialised = true
}
}()
// First, let's make sure this config is not already loaded // First, let's make sure this config is not already loaded
var configChanged bool var configChanged bool
if rawConfig == nil { if rawConfig == nil {

5
pkg/services/ngalert/notifier/alerts.go
View File

@@ -16,6 +16,7 @@ import (
var ( var (
ErrGetAlertsInternal = fmt.Errorf("unable to retrieve alerts(s) due to an internal error") ErrGetAlertsInternal = fmt.Errorf("unable to retrieve alerts(s) due to an internal error")
ErrGetAlertsUnavailable = fmt.Errorf("unable to retrieve alerts(s) as alertmanager is not initialised yet")
ErrGetAlertsBadPayload = fmt.Errorf("unable to retrieve alerts") ErrGetAlertsBadPayload = fmt.Errorf("unable to retrieve alerts")
ErrGetAlertGroupsBadPayload = fmt.Errorf("unable to retrieve alerts groups") ErrGetAlertGroupsBadPayload = fmt.Errorf("unable to retrieve alerts groups")
) )
@@ -27,6 +28,10 @@ func (am *Alertmanager) GetAlerts(active, silenced, inhibited bool, filter []str
res = apimodels.GettableAlerts{} res = apimodels.GettableAlerts{}
) )
if !am.initialised {
return res, ErrGetAlertsUnavailable
}
matchers, err := parseFilter(filter) matchers, err := parseFilter(filter)
if err != nil { if err != nil {
am.logger.Error("failed to parse matchers", "err", err) am.logger.Error("failed to parse matchers", "err", err)