feat(alerting): sql update fixes

torkelo · torkelo · commit 66c259426278 · 2016-06-11T14:08:55.000+02:00
diff --git 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
@@ -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
@@ -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
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func (e ExecutorImpl) executeQuery(job AlertJob) (tsdb.TimeSeriesSlice, error)`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`func (e ExecutorImpl) GetRequestForAlertRule(rule AlertRule, datasource m.DataSource) tsdb.Request {`
`72`		`- log.Debug2("GetRequest", "query", rule.Query.Query, "from", rule.Query.From, "datasourceId", datasource.Id)`
	`72`	`+ e.log.Debug("GetRequest", "query", rule.Query.Query, "from", rule.Query.From, "datasourceId", datasource.Id)`
`73`	`73`	`req := &tsdb.Request{`
`74`	`74`	`TimeRange: tsdb.TimeRange{`
`75`	`75`	`From: "-" + rule.Query.From,`
Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,7 @@ func upsertAlerts(alerts []m.Alert, posted []m.Alert, sess *xorm.Session) erro`
`184`	`184`	`update = true`
`185`	`185`	`alert.Id = k.Id`
`186`	`186`	`alertToUpdate = k`
	`187`	`+ break`
`187`	`188`	`}`
`188`	`189`	`}`
`189`	`190`
`@@ -224,6 +225,7 @@ func deleteMissingAlerts(alerts []m.Alert, posted []m.Alert, sess *xorm.Sessio`
`224`	`225`	`for _, k := range posted {`
`225`	`226`	`if missingAlert.PanelId == k.PanelId {`
`226`	`227`	`missing = false`
	`228`	`+ break`
`227`	`229`	`}`
`228`	`230`	`}`
`229`	`231`