Merge branch 'master' into 10190_fix_select_icon_and_firefox

pkg/services/alerting/notifiers/pushover.go

@@ -133,6 +133,7 @@ func (this *PushoverNotifier) Notify(evalContext *alerting.EvalContext) error {
 		this.log.Error("Failed get rule link", "error", err)
 		this.log.Error("Failed get rule link", "error", err)
 		return err
 		return err
 	}
 	}
+
 	message := evalContext.Rule.Message
 	message := evalContext.Rule.Message
 	for idx, evt := range evalContext.EvalMatches {
 	for idx, evt := range evalContext.EvalMatches {
 		message += fmt.Sprintf("\n<b>%s</b>: %v", evt.Metric, evt.Value)
 		message += fmt.Sprintf("\n<b>%s</b>: %v", evt.Metric, evt.Value)
@@ -146,6 +147,9 @@ func (this *PushoverNotifier) Notify(evalContext *alerting.EvalContext) error {
 	if evalContext.ImagePublicUrl != "" {
 	if evalContext.ImagePublicUrl != "" {
 		message += fmt.Sprintf("\n<a href=\"%s\">Show graph image</a>", evalContext.ImagePublicUrl)
 		message += fmt.Sprintf("\n<a href=\"%s\">Show graph image</a>", evalContext.ImagePublicUrl)
 	}
 	}
+	if message == "" {
+		message = "Notification message missing (Set a notification message to replace this text.)"
+	}
 
 
 	q := url.Values{}
 	q := url.Values{}
 	q.Add("user", this.UserKey)
 	q.Add("user", this.UserKey)

public/img/icons_dark_theme/Icon

--- "a/public/img/icons_dark_theme/Icon\r"

public/img/icons_light_theme/Icon

--- "a/public/img/icons_light_theme/Icon\r"