diff --git a/docs/sources/alerting/notifications.md b/docs/sources/alerting/notifications.md
index 359315650d9..de9e5abd472 100644
--- a/docs/sources/alerting/notifications.md
+++ b/docs/sources/alerting/notifications.md
@@ -48,12 +48,15 @@ external image destination if available or fallback to attaching the image in th
To set up slack you need to configure an incoming webhook url at slack. You can follow their guide for how
to do that https://api.slack.com/incoming-webhooks If you want to include screenshots of the firing alerts
-in the slack messages you have to configure the [external image destination](#external-image-store) in Grafana.
+in the slack messages you have to configure either the [external image destination](#external-image-store) in Grafana,
+or a bot integration via Slack Apps. Follow Slack's guide to set up a bot integration and use the token provided
+https://api.slack.com/bot-users, which starts with "xoxb".
Setting | Description
---------- | -----------
Recipient | allows you to override the slack recipient.
Mention | make it possible to include a mention in the slack notification sent by Grafana. Ex @here or @channel
+Token | If provided, Grafana will upload the generated image via Slack's file.upload API method, not the external image destination.
### PagerDuty
diff --git a/pkg/services/alerting/notifiers/slack.go b/pkg/services/alerting/notifiers/slack.go
index d917daa3620..ed1451da419 100644
--- a/pkg/services/alerting/notifiers/slack.go
+++ b/pkg/services/alerting/notifiers/slack.go
@@ -1,7 +1,11 @@
package notifiers
import (
+ "bytes"
"encoding/json"
+ "io"
+ "mime/multipart"
+ "os"
"time"
"github.com/grafana/grafana/pkg/bus"
@@ -15,7 +19,7 @@ func init() {
alerting.RegisterNotifier(&alerting.NotifierPlugin{
Type: "slack",
Name: "Slack",
- Description: "Sends notifications using Grafana server configured STMP settings",
+ Description: "Sends notifications to Slack via Slack Webhooks",
Factory: NewSlackNotifier,
OptionsTemplate: `
Slack settings
@@ -45,6 +49,17 @@ func init() {
Mention a user or a group using @ when notifying in a channel
+
+ Token
+
+
+
+ Provide a bot token to use the Slack file.upload API (starts with "xoxb")
+
+