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

Apply suggestions from code review

Browse Source
This commit is contained in:
Sofia Papagiannaki 2020-10-12 10:04:46 +03:00
parent 7f95800c5f
commit f35c5f52af
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,7 +201,7 @@ func (e *DashAlertExtractor) getAlertFromPanels(jsonWithPanels *simplejson.Json,
if ok {
continue
}
switch validator.aSeverity {
case alertError:
if validationErrors.Len() > 0 {
@ -219,7 +219,7 @@ func (e *DashAlertExtractor) getAlertFromPanels(jsonWithPanels *simplejson.Json,
return nil, ValidationError{Reason: validationErrors.String()}
}
if validationWarnings.String() != "" {
e.log.Debug(validationWarnings.String())
e.log.Warn(validationWarnings.String())
}
alerts = append(alerts, alert)
@ -231,7 +231,7 @@ func (e *DashAlertExtractor) getAlertFromPanels(jsonWithPanels *simplejson.Json,
func validateAlertRule(alert *models.Alert) (ok bool, reason string) {
ok = alert.ValidToSave()
if !ok {
reason = fmt.Sprintf("Panel id is not correct, alertName=%v, panelId=%v", alert.Name, alert.PanelId)
reason = fmt.Sprintf("Dashboard ID, Org ID or Panel ID is not correct, alertName=%v, panelId=%v, orgId=%v, dashboardId=%v", alert.Name, alert.PanelId, alert.OrgId, alert.DashboardId)
}
return ok, reason
}
@ -244,7 +244,7 @@ func validAlertJSON(alert *models.Alert) (ok bool, reason string) {
if err != nil {
continue
}
if _, err := translateNotificationIDToUID(id, alert.OrgId); err == nil {
continue
}
@ -253,7 +253,7 @@ func validAlertJSON(alert *models.Alert) (ok bool, reason string) {
if warnings.Len() > 0 {
warnings.WriteString("\n")
}
warnings.WriteString(fmt.Sprintf("Alert contains notification identified by incorrect id, alertName=%v, panelId=%v, notificationId=%v", alert.Name, alert.PanelId, id))
warnings.WriteString(fmt.Sprintf("Alert contains notification identified by incorrect ID, alertName=%v, panelId=%v, notificationId=%v", alert.Name, alert.PanelId, id))
}
reason = warnings.String()
return ok, reason
@ -315,7 +315,7 @@ func (e *DashAlertExtractor) ValidateAlerts() error {
aFunc: func(alert *models.Alert) (ok bool, reason string) {
ok = alert.OrgId != 0 && alert.PanelId != 0
if !ok {
reason = fmt.Sprintf("Panel ID is not correct, alertName=%v, panelId=%v", alert.Name, alert.PanelId)
reason = fmt.Sprintf("Org ID or Panel ID is not correct, alertName=%v, panelId=%v, orgId=%v", alert.Name, alert.PanelId, alert.OrgId)
}
return ok, reason
},