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

Merge branch 'master' into 10190_fix_select_icon_and_firefox

Browse Source
This commit is contained in:
Johannes Schill
2017-12-19 14:55:18 +01:00
parent f6163a59af 326ba11c42
commit bc7462cd04
3 changed files with 4 additions and 0 deletions
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) 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)

0
public/img/icons_dark_theme/Icon
View File

0
public/img/icons_light_theme/Icon
View File