From e77a756eba80c7bf212fe9c5ac9081888a8628dc Mon Sep 17 00:00:00 2001
From: Joey Orlando <joseph.t.orlando@gmail.com>
Date: Mon, 20 Mar 2023 12:05:20 +0100
Subject: [PATCH 1/2] update integration heartbeat description to use 'alert
 group' instead of 'incident'

---
 .../src/containers/HeartbeatModal/HeartbeatForm.tsx         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/grafana-plugin/src/containers/HeartbeatModal/HeartbeatForm.tsx b/grafana-plugin/src/containers/HeartbeatModal/HeartbeatForm.tsx
index 936afea5be..cd48a4add6 100644
--- a/grafana-plugin/src/containers/HeartbeatModal/HeartbeatForm.tsx
+++ b/grafana-plugin/src/containers/HeartbeatModal/HeartbeatForm.tsx
@@ -85,11 +85,11 @@ const HeartbeatForm = observer(({ alertReceveChannelId, onUpdate }: HeartBeatMod
       <br />
       <br />
       <p>
-        A heartbeat acts as a healthcheck for incident monitoring. You can configure OnCall to regularly send alerts to
-        the heartbeat endpoint. If you don't receive one of these alerts, OnCall will issue an incident.
+        A heartbeat acts as a healthcheck for alert group monitoring. You can configure OnCall to regularly send alerts
+        to the heartbeat endpoint. If you don't receive one of these alerts, OnCall will issue an alert group.
       </p>
       <p>
-        <span>OnCall will issue an incident if no alert is received every</span>
+        <span>OnCall will issue an alert group if no alert is received every</span>
         <WithPermissionControlTooltip userAction={UserActions.IntegrationsWrite}>
           <Select
             className={cx('select', 'timeout')}

From 2c1d49f97a76df034edef827369e7f270b604df9 Mon Sep 17 00:00:00 2001
From: Joey Orlando <joseph.t.orlando@gmail.com>
Date: Mon, 20 Mar 2023 12:07:04 +0100
Subject: [PATCH 2/2] changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4837b64dc9..37332d74f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Updated wording in some Slack messages to use 'Alert Group' instead of 'Incident' ([1565](https://github.com/grafana/oncall/pull/1565))
+- Updated wording throughout plugin to use 'Alert Group' instead of 'Incident' ([1565](https://github.com/grafana/oncall/pull/1565),
+  [1576](https://github.com/grafana/oncall/pull/1576))
 
 ### Fixed