public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14593 from bergquist/export_create_notifier_func

Browse Source 
export init notifier func
This commit is contained in:
Carl Bergquist
2018-12-19 13:51:40 +01:00
committed by GitHub
parent d0f8d034df 69489993c3
commit 52ccb49167
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/alerting/notifier.go
+4 -2
View File
@@ -166,7 +166,7 @@ func (n *notificationService) getNeededNotifiers(orgId int64, notificationIds []
var result notifierStateSlice var result notifierStateSlice
for _, notification := range query.Result { for _, notification := range query.Result {
not, err := n.createNotifierFor(notification) not, err := InitNotifier(notification)
if err != nil { if err != nil {
n.log.Error("Could not create notifier", "notifier", notification.Id, "error", err) n.log.Error("Could not create notifier", "notifier", notification.Id, "error", err)
continue continue
@@ -195,7 +195,8 @@ func (n *notificationService) getNeededNotifiers(orgId int64, notificationIds []
return result, nil return result, nil
} }
func (n *notificationService) createNotifierFor(model *m.AlertNotification) (Notifier, error) { // InitNotifier instantiate a new notifier based on the model
func InitNotifier(model *m.AlertNotification) (Notifier, error) {
notifierPlugin, found := notifierFactories[model.Type] notifierPlugin, found := notifierFactories[model.Type]
if !found { if !found {
return nil, errors.New("Unsupported notification type") return nil, errors.New("Unsupported notification type")
@@ -208,6 +209,7 @@ type NotifierFactory func(notification *m.AlertNotification) (Notifier, error)
var notifierFactories = make(map[string]*NotifierPlugin) var notifierFactories = make(map[string]*NotifierPlugin)
// RegisterNotifier register an notifier
func RegisterNotifier(plugin *NotifierPlugin) { func RegisterNotifier(plugin *NotifierPlugin) {
notifierFactories[plugin.Type] = plugin notifierFactories[plugin.Type] = plugin
} }
pkg/services/alerting/test_notification.go
+1 -1
View File
@@ -32,7 +32,7 @@ func handleNotificationTestCommand(cmd *NotificationTestCommand) error {
Settings: cmd.Settings, Settings: cmd.Settings,
} }
notifiers, err := notifier.createNotifierFor(model) notifiers, err := InitNotifier(model)
if err != nil { if err != nil {
log.Error2("Failed to create notifier", "error", err.Error()) log.Error2("Failed to create notifier", "error", err.Error())