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 remote-tracking branch 'origin/master' into alerting_reminder

Browse Source
This commit is contained in:
Marcus Efraimsson
2018-08-22 18:08:50 +02:00
parent 2e1c4b3d76 97fbf5c033
commit 34e448c6d4
23 changed files with 574 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,7 +153,7 @@ There are a couple of configuration options which need to be set up in Grafana U
Once these two properties are set, you can send the alerts to Kafka for further processing or throttling.
### All supported notifier
### All supported notifiers
Name | Type |Support images | Support reminders
-----|------------ | ------ | ------ |
@@ -170,6 +170,7 @@ Threema | `threema` | yes | yes
Pushover | `pushover` | no | yes
Telegram | `telegram` | no | yes
Line | `line` | no | yes
Microsoft Teams | `teams` | yes | yes
Prometheus Alertmanager | `prometheus-alertmanager` | no | no