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

Renamed validation funcs for alert notification

Browse Source
This commit is contained in:
Pavel Bakulev 2018-12-05 18:17:47 +02:00
parent 7b09dd38d8
commit 6d1ec19fe9
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/services/provisioning/alert_notifications/config_reader.go
View File

@ -41,12 +41,9 @@ func (cr *configReader) readConfig(path string) ([]*notificationsAsConfig, error
} }
cr.log.Debug("Validating alert notifications") cr.log.Debug("Validating alert notifications")
err = validateDefaultUniqueness(notifications) validateOrgIdAndSet(notifications)
if err != nil {
return nil, err
}
err = validateType(notifications) err = validateNotifications(notifications)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -70,7 +67,7 @@ func (cr *configReader) parseNotificationConfig(path string, file os.FileInfo) (
return cfg.mapToNotificationFromConfig(), nil return cfg.mapToNotificationFromConfig(), nil
} }
func validateDefaultUniqueness(notifications []*notificationsAsConfig) error { func validateOrgIdAndSet(notifications []*notificationsAsConfig) {
for i := range notifications { for i := range notifications {
for _, notification := range notifications[i].Notifications { for _, notification := range notifications[i].Notifications {
if notification.OrgId < 1 { if notification.OrgId < 1 {
@ -93,10 +90,9 @@ func validateDefaultUniqueness(notifications []*notificationsAsConfig) error {
} }
} }
return nil
} }
func validateType(notifications []*notificationsAsConfig) error { func validateNotifications(notifications []*notificationsAsConfig) error {
notifierTypes := alerting.GetNotifiers() notifierTypes := alerting.GetNotifiers()
for i := range notifications { for i := range notifications {