IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-11 16:15:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Also include configured AlertRuleTags in Webhooks (#18233)

Browse Source 
* added alert rule tags in webhook notifications

* fix: don't include whole list of Tag objects but only key/value pairs in Webhook JSON

* marked webhook alerts to support alert rule tags
This commit is contained in:
Dominic Miglar 2019-08-03 17:00:40 +02:00 committed by Torkel Ödegaard
parent e8790c32ca
commit 32d6740b8f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sources/alerting/notifications.md
View File

@ -186,7 +186,7 @@ Slack | `slack` | yes | no
Telegram | `telegram` | yes | no Telegram | `telegram` | yes | no
Threema | `threema` | yes, external only | no Threema | `threema` | yes, external only | no
VictorOps | `victorops` | yes, external only | no VictorOps | `victorops` | yes, external only | no
Webhook | `webhook` | yes, external only | no Webhook | `webhook` | yes, external only | yes
# Enable images in notifications {#external-image-store} # Enable images in notifications {#external-image-store}

8
pkg/services/alerting/notifiers/webhook.go
View File

@ -81,6 +81,14 @@ func (wn *WebhookNotifier) Notify(evalContext *alerting.EvalContext) error {
bodyJSON.Set("state", evalContext.Rule.State) bodyJSON.Set("state", evalContext.Rule.State)
bodyJSON.Set("evalMatches", evalContext.EvalMatches) bodyJSON.Set("evalMatches", evalContext.EvalMatches)
tags := make(map[string]string)
for _, tag := range evalContext.Rule.AlertRuleTags {
tags[tag.Key] = tag.Value
}
bodyJSON.Set("tags", tags)
ruleURL, err := evalContext.GetRuleURL() ruleURL, err := evalContext.GetRuleURL()
if err == nil { if err == nil {
bodyJSON.Set("ruleUrl", ruleURL) bodyJSON.Set("ruleUrl", ruleURL)