From cac8ae44852960d2011c39a8cb5e62afd0ae7763 Mon Sep 17 00:00:00 2001
From: Simon Pasquier <spasquie@redhat.com>
Date: Thu, 17 May 2018 10:21:07 +0200
Subject: [PATCH 1/2] alerting: update Slack configuration

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
---
 content/docs/alerting/configuration.md | 39 +++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/content/docs/alerting/configuration.md b/content/docs/alerting/configuration.md
index 20a93849a..78b3167cc 100755
--- a/content/docs/alerting/configuration.md
+++ b/content/docs/alerting/configuration.md
@@ -436,7 +436,9 @@ token: <secret>
 
 ## `<slack_config>`
 
-Slack notifications are sent via [Slack webhooks](https://api.slack.com/incoming-webhooks).
+Slack notifications are sent via [Slack
+webhooks](https://api.slack.com/incoming-webhooks). The notification contains
+an [attachment](https://api.slack.com/docs/message-attachments).
 
 ```yaml
 # Whether or not to notify about resolved alerts.
@@ -449,20 +451,49 @@ Slack notifications are sent via [Slack webhooks](https://api.slack.com/incoming
 channel: <tmpl_string>
 
 # API request data as defined by the Slack webhook API.
-[ color: <tmpl_string> | default = '{{ if eq .Status "firing" }}danger{{ else }}good{{ end }}' ]
+[ icon_emoji: <tmpl_string> ]
+[ icon_url: <tmpl_string> ]
+[ link_names: <boolean> | default = false ]
 [ username: <tmpl_string> | default = '{{ template "slack.default.username" . }}' ]
+# The following parameters define the attachment.
+[ color: <tmpl_string> | default = '{{ if eq .Status "firing" }}danger{{ else }}good{{ end }}' ]
 [ title: <tmpl_string> | default = '{{ template "slack.default.title" . }}' ]
 [ title_link: <tmpl_string> | default = '{{ template "slack.default.titlelink" . }}' ]
-[ icon_emoji: <tmpl_string> ]
-[ icon_url: <tmpl_string> ]
 [ pretext: <tmpl_string> | default = '{{ template "slack.default.pretext" . }}' ]
 [ text: <tmpl_string> | default = '{{ template "slack.default.text" . }}' ]
 [ fallback: <tmpl_string> | default = '{{ template "slack.default.fallback" . }}' ]
+[ footer: <tmpl_string> | default = '{{ template "slack.default.footer" . }}' ]
+fields:
+  [ <field_config> ... ]
+actions:
+  [ <action_config> ... ]
+[ short_fields: <boolean> | default = false ]
 
 # The HTTP client's configuration.
 [ http_config: <http_config> | default = global.http_config ]
 ```
 
+### `<action_config>`
+
+The fields are documented in the [Slack API documentation](https://api.slack.com/docs/message-attachments#action_fields).
+
+```yaml
+type: <tmpl_string>
+text: <tmpl_string>
+url: <tmpl_string>
+[ style: <tmpl_string> [ default = '' ]
+```
+
+### `<field_config>`
+
+The fields are documented in the [Slack API documentation](https://api.slack.com/docs/message-attachments#fields).
+
+```yaml
+title: <tmpl_string>
+value: <tmpl_string>
+[ short: <boolean> | default = slack_config.short_fields ]
+```
+
 ## `<opsgenie_config>`
 
 OpsGenie notifications are sent via the [OpsGenie API](https://www.opsgenie.com/docs/web-api/alert-api).

From 1508b090c8212486701a625b3c4d431a218c5624 Mon Sep 17 00:00:00 2001
From: Simon Pasquier <spasquie@redhat.com>
Date: Fri, 18 May 2018 14:15:41 +0200
Subject: [PATCH 2/2] alerting: re-order Slack parameters

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
---
 content/docs/alerting/configuration.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/content/docs/alerting/configuration.md b/content/docs/alerting/configuration.md
index 78b3167cc..40a0e8784 100755
--- a/content/docs/alerting/configuration.md
+++ b/content/docs/alerting/configuration.md
@@ -456,18 +456,18 @@ channel: <tmpl_string>
 [ link_names: <boolean> | default = false ]
 [ username: <tmpl_string> | default = '{{ template "slack.default.username" . }}' ]
 # The following parameters define the attachment.
+actions:
+  [ <action_config> ... ]
 [ color: <tmpl_string> | default = '{{ if eq .Status "firing" }}danger{{ else }}good{{ end }}' ]
-[ title: <tmpl_string> | default = '{{ template "slack.default.title" . }}' ]
-[ title_link: <tmpl_string> | default = '{{ template "slack.default.titlelink" . }}' ]
-[ pretext: <tmpl_string> | default = '{{ template "slack.default.pretext" . }}' ]
-[ text: <tmpl_string> | default = '{{ template "slack.default.text" . }}' ]
 [ fallback: <tmpl_string> | default = '{{ template "slack.default.fallback" . }}' ]
-[ footer: <tmpl_string> | default = '{{ template "slack.default.footer" . }}' ]
 fields:
   [ <field_config> ... ]
-actions:
-  [ <action_config> ... ]
+[ footer: <tmpl_string> | default = '{{ template "slack.default.footer" . }}' ]
+[ pretext: <tmpl_string> | default = '{{ template "slack.default.pretext" . }}' ]
 [ short_fields: <boolean> | default = false ]
+[ text: <tmpl_string> | default = '{{ template "slack.default.text" . }}' ]
+[ title: <tmpl_string> | default = '{{ template "slack.default.title" . }}' ]
+[ title_link: <tmpl_string> | default = '{{ template "slack.default.titlelink" . }}' ]
 
 # The HTTP client's configuration.
 [ http_config: <http_config> | default = global.http_config ]