feat(alerting): minor fixes

pkg/services/alerting/commands.go

@@ -25,13 +25,13 @@ func updateDashboardAlerts(cmd *UpdateDashboardAlertsCommand) error {
 
 	extractor := NewDashAlertExtractor(cmd.Dashboard, cmd.OrgId)
 
-	alerts, err := extractor.GetRuleModels()
-	if err != nil {
+	if alerts, err := extractor.GetAlerts(); err != nil {
 		return err
+	} else {
+		saveAlerts.Alerts = alerts
 	}
 
-	saveAlerts.Alerts = alerts
-	if bus.Dispatch(&saveAlerts); err != nil {
+	if err := bus.Dispatch(&saveAlerts); err != nil {
 		return err
 	}
 

pkg/services/alerting/extractor.go

@@ -47,7 +47,8 @@ func (e *DashAlertExtractor) lookupDatasourceId(dsName string) (int64, error) {
 	return 0, errors.New("Could not find datasource id for " + dsName)
 }
 
-func (e *DashAlertExtractor) GetRuleModels() ([]*m.Alert, error) {
+func (e *DashAlertExtractor) GetAlerts() ([]*m.Alert, error) {
+	e.log.Debug("GetAlerts")
 
 	alerts := make([]*m.Alert, 0)
 
@@ -116,5 +117,6 @@ func (e *DashAlertExtractor) GetRuleModels() ([]*m.Alert, error) {
 		}
 	}
 
+	e.log.Debug("Extracted alerts from dashboard", "alertCount", len(alerts))
 	return alerts, nil
 }