Merge pull request #6453 from utkarshcmu/alert_message_typo

Log bad alert config and fixed alert message typo

Merge pull request #6453 from utkarshcmu/alert_message_typo
Log bad alert config and fixed alert message typo
89a3d023 · Carl Bergquist · GitHub · bb7f03c9 · d009c6b9 · 89a3d023
Commit 89a3d023 authored Nov 03, 2016 by Carl Bergquist Committed by GitHub Nov 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

pkg/services/alerting/extractor.go
+2 -1

No files found.
--- a/pkg/services/alerting/extractor.go
+++ b/pkg/services/alerting/extractor.go
@@ -104,7 +104,8 @@ func (e *DashAlertExtractor) GetAlerts() ([]*m.Alert, error) {
 				panelQuery := findPanelQueryByRefId(panel, queryRefId)

 				if panelQuery == nil {
-					return nil, ValidationError{Reason: "Alert refes to query that cannot be found"}
+					e.log.Error("Query not found", "panel", alert.PanelId, "queryRefId", queryRefId)
+					return nil, ValidationError{Reason: "Alert refers to query that cannot be found"}
 				}

 				dsName := ""