diff --git a/docs/sources/alerting/fundamentals/contact-points/index.md b/docs/sources/alerting/fundamentals/contact-points/index.md index 3286e32ac2b..3c28c0c5df5 100644 --- a/docs/sources/alerting/fundamentals/contact-points/index.md +++ b/docs/sources/alerting/fundamentals/contact-points/index.md @@ -47,7 +47,7 @@ The following table lists the contact point integrations supported by Grafana. | [Google Chat](https://chat.google.com/) | `googlechat` | Supported | N/A | | [Kafka](https://kafka.apache.org/) | `kafka` | Supported | N/A | | [Line](https://line.me/en/) | `line` | Supported | N/A | -| [Microsoft Teams](https://teams.microsoft.com/) | `teams` | Supported | N/A | +| [Microsoft Teams](https://teams.microsoft.com/) | `teams` | Supported | Supported | | [Opsgenie](https://atlassian.com/opsgenie/) | `opsgenie` | Supported | Supported | | [Pagerduty](https://www.pagerduty.com/) | `pagerduty` | Supported | Supported | | [Prometheus Alertmanager](https://prometheus.io) | `prometheus-alertmanager` | Supported | N/A | diff --git a/public/app/features/alerting/unified/utils/cloud-alertmanager-notifier-types.ts b/public/app/features/alerting/unified/utils/cloud-alertmanager-notifier-types.ts index 31355b79a49..df76463fb5a 100644 --- a/public/app/features/alerting/unified/utils/cloud-alertmanager-notifier-types.ts +++ b/public/app/features/alerting/unified/utils/cloud-alertmanager-notifier-types.ts @@ -491,6 +491,22 @@ export const cloudNotifierTypes: Array> = [ }), ], }, + { + name: 'Microsoft Teams', + description: 'Sends notifications to Microsoft Teams', + type: 'msteams', + info: '', + heading: 'Microsoft Teams settings', + options: [ + option('webhook_url', 'Webhook URL', 'The incoming webhook URL.'), + option('title', 'Title', 'Message title template.', { + placeholder: '{{ template "teams.default.title" . }}', + }), + option('text', 'Text', 'Message body template.', { + placeholder: '{{ template "teams.default.text" . }}', + }), + ], + }, ]; export const globalConfigOptions: NotificationChannelOption[] = [ diff --git a/public/app/plugins/datasource/alertmanager/consts.ts b/public/app/plugins/datasource/alertmanager/consts.ts index 3d0aef240df..7e63f989f84 100644 --- a/public/app/plugins/datasource/alertmanager/consts.ts +++ b/public/app/plugins/datasource/alertmanager/consts.ts @@ -10,4 +10,5 @@ export const receiverTypeNames: Record = { webex: 'Cisco Webex Teams', sns: 'Amazon SNS', telegram: 'Telegram', + msteams: 'Microsoft Teams', }; diff --git a/public/app/types/alerting.ts b/public/app/types/alerting.ts index dbec1fdeb20..4f4fee28e19 100644 --- a/public/app/types/alerting.ts +++ b/public/app/types/alerting.ts @@ -71,7 +71,8 @@ export type CloudNotifierType = | 'webex' | 'telegram' | 'sns' - | 'discord'; + | 'discord' + | 'msteams'; export type NotifierType = GrafanaNotifierType | CloudNotifierType; export interface NotifierDTO {