root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 43 Packages Projects Releases Wiki Activity

Merge branch 'patch-1' of https://github.com/devkid/grafana into devkid-patch-1 

* 'patch-1' of https://github.com/devkid/grafana:
  Add default message for Pushover notifications
This commit is contained in:
Carl Bergquist 2017-12-19 14:30:09 +01:00
parent 887af65ca9 72e686457c
commit f36aa2e953
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/services/alerting/notifiers/pushover.go
View File

@ -133,6 +133,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<b>%s</b>: %v", evt.Metric, evt.Value)
@ -146,6 +147,9 @@ func (this *PushoverNotifier) Notify(evalContext *alerting.EvalContext) error {
if evalContext.ImagePublicUrl != "" {
message += fmt.Sprintf("\n<a href=\"%s\">Show graph image</a>", 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)