From 72e686457c9f0f7115ce25cc3c2a4041cf4ce797 Mon Sep 17 00:00:00 2001 From: Alfred Krohmer Date: Mon, 11 Dec 2017 21:51:46 +0100 Subject: [PATCH] Add default message for Pushover notifications If the message field is left empty for Pushover notifications, the API will return an error. This adds a default message if the message would otherwise be empty. This fixes #8006. --- pkg/services/alerting/notifiers/pushover.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/services/alerting/notifiers/pushover.go b/pkg/services/alerting/notifiers/pushover.go index ecb4ed42e3e..0fe93424f63 100644 --- a/pkg/services/alerting/notifiers/pushover.go +++ b/pkg/services/alerting/notifiers/pushover.go @@ -129,6 +129,7 @@ func (this *PushoverNotifier) Notify(evalContext *alerting.EvalContext) error { this.log.Error("Failed get rule link", "error", err) return err } + message := evalContext.Rule.Message for idx, evt := range evalContext.EvalMatches { message += fmt.Sprintf("\n%s: %v", evt.Metric, evt.Value) @@ -142,6 +143,9 @@ func (this *PushoverNotifier) Notify(evalContext *alerting.EvalContext) error { if evalContext.ImagePublicUrl != "" { message += fmt.Sprintf("\nShow graph image", evalContext.ImagePublicUrl) } + if message == "" { + message = "Nothing to see here! (Set a notification message to replace this text.)" + } q := url.Values{} q.Add("user", this.UserKey)