From e1b87fc597c634ca2f7317af85dd922f76558184 Mon Sep 17 00:00:00 2001 From: Pavel Bakulev Date: Tue, 4 Dec 2018 11:20:40 +0200 Subject: [PATCH] Added parameter org_name of alert notification to documentation --- docs/sources/administration/provisioning.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/sources/administration/provisioning.md b/docs/sources/administration/provisioning.md index 6b8a1a992da..a926f926ca9 100644 --- a/docs/sources/administration/provisioning.md +++ b/docs/sources/administration/provisioning.md @@ -230,10 +230,7 @@ By default Grafana will delete dashboards in the database if the file is removed > **Note.** Provisioning allows you to overwrite existing dashboards > which leads to problems if you re-use settings that are supposed to be unique. > Be careful not to re-use the same `title` multiple times within a folder -<<<<<<< HEAD > or `uid` within the same installation as this will cause weird behaviors. -======= -> or `uid` within the same installation as this will cause weird behaviours. ## Alert Notification Channels @@ -270,7 +267,10 @@ By default, exporting a dashboard as JSON will use a sequential identifier to re alert_notifications: - name: notification-channel-1 type: slack + # either org_id: 2 + # or + org_name: Main Org. is_default: true # See `Supported Settings` section for settings supporter for each # alert notification type. @@ -281,8 +281,12 @@ alert_notifications: delete_alert_notifications: - name: notification-channel-1 + # either org_id: 2 + # or + org_name: Main Org. - name: notification-channel-2 + # default org_id: 1 ``` ### Supported Settings @@ -407,5 +411,4 @@ The following sections detail the supported settings for each alert notification | ---- | | url | | username | -| password | ->>>>>>> Added alert_notification configuration +| password | \ No newline at end of file