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

feat(alerting): minor fixes

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-06-11 11:54:46 +02:00
parent 382f396247
commit 77a5e3f14d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/services/alerting/commands.go
View File

@ -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
}

4
pkg/services/alerting/extractor.go
View File

@ -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
}