diff --git a/pkg/services/alerting/commands.go b/pkg/services/alerting/commands.go index 4dba9c65685..2d32396c7e1 100644 --- a/pkg/services/alerting/commands.go +++ b/pkg/services/alerting/commands.go @@ -19,8 +19,9 @@ func init() { func updateDashboardAlerts(cmd *UpdateDashboardAlertsCommand) error { saveAlerts := m.SaveAlertsCommand{ - OrgId: cmd.OrgId, - UserId: cmd.UserId, + OrgId: cmd.OrgId, + UserId: cmd.UserId, + DashboardId: cmd.Dashboard.Id, } extractor := NewDashAlertExtractor(cmd.Dashboard, cmd.OrgId) diff --git a/pkg/services/alerting/executor.go b/pkg/services/alerting/executor.go index 1520bc494c0..3ab3e26cb70 100644 --- a/pkg/services/alerting/executor.go +++ b/pkg/services/alerting/executor.go @@ -69,7 +69,7 @@ func (e *ExecutorImpl) executeQuery(job *AlertJob) (tsdb.TimeSeriesSlice, error) } func (e *ExecutorImpl) GetRequestForAlertRule(rule *AlertRule, datasource *m.DataSource) *tsdb.Request { - log.Debug2("GetRequest", "query", rule.Query.Query, "from", rule.Query.From, "datasourceId", datasource.Id) + e.log.Debug("GetRequest", "query", rule.Query.Query, "from", rule.Query.From, "datasourceId", datasource.Id) req := &tsdb.Request{ TimeRange: tsdb.TimeRange{ From: "-" + rule.Query.From, diff --git a/pkg/services/sqlstore/alert.go b/pkg/services/sqlstore/alert.go index e7166c18932..9d92f0ebb47 100644 --- a/pkg/services/sqlstore/alert.go +++ b/pkg/services/sqlstore/alert.go @@ -184,6 +184,7 @@ func upsertAlerts(alerts []*m.Alert, posted []*m.Alert, sess *xorm.Session) erro update = true alert.Id = k.Id alertToUpdate = k + break } } @@ -224,6 +225,7 @@ func deleteMissingAlerts(alerts []*m.Alert, posted []*m.Alert, sess *xorm.Sessio for _, k := range posted { if missingAlert.PanelId == k.PanelId { missing = false + break } }