Commit 6dd45d6a authored by Tobias Schmidt's avatar Tobias Schmidt Committed by GitHub

Merge pull request #661 from roman-vynar/slack-iconurl

Add missed slack icon_url to AlertManager config.
parents 731426bb 53602e50
...@@ -255,7 +255,7 @@ to: <tmpl_string> ...@@ -255,7 +255,7 @@ to: <tmpl_string>
[ require_tls: <bool> | default = global.smtp_require_tls ] [ require_tls: <bool> | default = global.smtp_require_tls ]
# The HTML body of the email notification. # The HTML body of the email notification.
[ html: <tmpl_string> | default = '{{ template "email.default.html" . }}' ] [ html: <tmpl_string> | default = '{{ template "email.default.html" . }}' ]
# Further headers email header key/value pairs. Overrides any headers # Further headers email header key/value pairs. Overrides any headers
# previously set by the notification implementation. # previously set by the notification implementation.
...@@ -373,6 +373,7 @@ channel: <tmpl_string> ...@@ -373,6 +373,7 @@ channel: <tmpl_string>
[ title: <tmpl_string> | default = '{{ template "slack.default.title" . }}' ] [ title: <tmpl_string> | default = '{{ template "slack.default.title" . }}' ]
[ title_link: <tmpl_string> | default = '{{ template "slack.default.titlelink" . }}' ] [ title_link: <tmpl_string> | default = '{{ template "slack.default.titlelink" . }}' ]
[ icon_emoji: <tmpl_string> ] [ icon_emoji: <tmpl_string> ]
[ icon_url: <tmpl_string> ]
[ pretext: <tmpl_string> | default = '{{ template "slack.default.pretext" . }}' ] [ pretext: <tmpl_string> | default = '{{ template "slack.default.pretext" . }}' ]
[ text: <tmpl_string> | default = '{{ template "slack.default.text" . }}' ] [ text: <tmpl_string> | default = '{{ template "slack.default.text" . }}' ]
[ fallback: <tmpl_string> | default = '{{ template "slack.default.fallback" . }}' ] [ fallback: <tmpl_string> | default = '{{ template "slack.default.fallback" . }}' ]
...@@ -411,7 +412,7 @@ api_key: <string> ...@@ -411,7 +412,7 @@ api_key: <string>
## Webhook receiver `<webhook_config>` ## Webhook receiver `<webhook_config>`
The webhook receiver allows configuring a generic receiver. The webhook receiver allows configuring a generic receiver.
``` ```
# Whether or not to notify about resolved alerts. # Whether or not to notify about resolved alerts.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment