diff --git a/docs/sources/alerting/alerting-rules/manage-contact-points/configure-integrations.md b/docs/sources/alerting/alerting-rules/manage-contact-points/configure-integrations.md index 2ff8e797f67..03eb242ba2d 100644 --- a/docs/sources/alerting/alerting-rules/manage-contact-points/configure-integrations.md +++ b/docs/sources/alerting/alerting-rules/manage-contact-points/configure-integrations.md @@ -32,7 +32,7 @@ Once configured, you can use integrations as part of your contact points to rece | DingDing | `dingding` | | Discord | `discord` | | Email | `email` | -| Google Hangouts Chat | `googlechat` | +| Google Chat | `googlechat` | | Hipchat | `hipchat` | | Kafka | `kafka` | | Line | `line` | diff --git a/docs/sources/alerting/fundamentals/contact-points/index.md b/docs/sources/alerting/fundamentals/contact-points/index.md index dac8af6ce88..3286e32ac2b 100644 --- a/docs/sources/alerting/fundamentals/contact-points/index.md +++ b/docs/sources/alerting/fundamentals/contact-points/index.md @@ -44,7 +44,7 @@ The following table lists the contact point integrations supported by Grafana. | [DingDing](https://www.dingtalk.com/en) | `dingding` | Supported | N/A | | [Discord](https://discord.com/) | `discord` | Supported | N/A | | Email | `email` | Supported | Supported | -| [Google Hangouts](https://hangouts.google.com/) | `googlechat` | Supported | N/A | +| [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 | diff --git a/docs/sources/alerting/manage-notifications/images-in-notifications.md b/docs/sources/alerting/manage-notifications/images-in-notifications.md index 6d799ba2050..c882ca12aeb 100644 --- a/docs/sources/alerting/manage-notifications/images-in-notifications.md +++ b/docs/sources/alerting/manage-notifications/images-in-notifications.md @@ -94,7 +94,7 @@ Grafana supports a wide range of contact points with varied support for images i | DingDing | No | No | | Discord | Yes (Maximum of 10 per notification) | Yes (Maximum of 10 per notification) | | Email | Yes (Embedded in the email) | Yes | -| Google Hangouts Chat | No | Yes | +| Google Chat | No | Yes | | Kafka | No | No | | Line | No | No | | Microsoft Teams | No | Yes | diff --git a/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md b/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md index 8b207c4d20a..a699192b949 100644 --- a/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md +++ b/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md @@ -247,7 +247,7 @@ settings: {{ template "default.title" . }} ``` -##### Google Hangouts Chat +##### Google Chat ```yaml type: googlechat diff --git a/go.mod b/go.mod index 612530c2481..e060b8e2d9b 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( github.com/google/uuid v1.3.0 // @grafana/backend-platform github.com/google/wire v0.5.0 // @grafana/backend-platform github.com/gorilla/websocket v1.5.0 // @grafana/grafana-app-platform-squad - github.com/grafana/alerting v0.0.0-20230825102000-717e20092271 // @grafana/alerting-squad-backend + github.com/grafana/alerting v0.0.0-20230831092459-f7dba8ede9b0 // @grafana/alerting-squad-backend github.com/grafana/cuetsy v0.1.10 // @grafana/grafana-as-code github.com/grafana/grafana-aws-sdk v0.19.1 // @grafana/aws-datasources github.com/grafana/grafana-azure-sdk-go v1.7.0 // @grafana/backend-platform diff --git a/go.sum b/go.sum index 0fe1ae0cb69..9f3de1e7f9b 100644 --- a/go.sum +++ b/go.sum @@ -1765,6 +1765,8 @@ github.com/gotestyourself/gotestyourself v1.3.0/go.mod h1:zZKM6oeNM8k+FRljX1mnzV github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= github.com/grafana/alerting v0.0.0-20230825102000-717e20092271 h1:Nl7/Da/OLKrB5MpSKzSqQsshOIXmXjzcUBZ83ge1sKY= github.com/grafana/alerting v0.0.0-20230825102000-717e20092271/go.mod h1:gyUqgDT+v6gARVCpbfi8bb/WiGNELNJiq6hGKadnIxc= +github.com/grafana/alerting v0.0.0-20230831092459-f7dba8ede9b0 h1:iDCcF7YzzVWQDtgUp3pS5caAAfI3lk7RZ0BI5DMrero= +github.com/grafana/alerting v0.0.0-20230831092459-f7dba8ede9b0/go.mod h1:gyUqgDT+v6gARVCpbfi8bb/WiGNELNJiq6hGKadnIxc= github.com/grafana/codejen v0.0.3 h1:tAWxoTUuhgmEqxJPOLtJoxlPBbMULFwKFOcRsPRPXDw= github.com/grafana/codejen v0.0.3/go.mod h1:zmwwM/DRyQB7pfuBjTWII3CWtxcXh8LTwAYGfDfpR6s= github.com/grafana/cuetsy v0.1.10 h1:+W9/7roI8LorL+D1RJhKGdhsTZ81adrK9dHS0r7qsXs= diff --git a/pkg/services/ngalert/notifier/channels_config/available_channels.go b/pkg/services/ngalert/notifier/channels_config/available_channels.go index fd6f080d566..9544b8ef330 100644 --- a/pkg/services/ngalert/notifier/channels_config/available_channels.go +++ b/pkg/services/ngalert/notifier/channels_config/available_channels.go @@ -1096,15 +1096,15 @@ func GetAvailableNotifiers() []*NotifierPlugin { }, { Type: "googlechat", - Name: "Google Hangouts Chat", - Description: "Sends notifications to Google Hangouts Chat via webhooks based on the official JSON message format", - Heading: "Google Hangouts Chat settings", + Name: "Google Chat", + Description: "Sends notifications to Google Chat via webhooks based on the official JSON message format", + Heading: "Google Chat settings", Options: []NotifierOption{ { Label: "URL", Element: ElementTypeInput, InputType: InputTypeText, - Placeholder: "Google Hangouts Chat incoming webhook url", + Placeholder: "Google Chat incoming webhook url", PropertyName: "url", Required: true, },