Skip to content

Commit

Permalink
update wording in some Slack messages which mention 'incident' instea…
Browse files Browse the repository at this point in the history
…d of 'alert group' (#1565)

# What this PR does


![image](https://user-images.githubusercontent.com/9406895/225678127-4a0bcf96-742e-4335-9958-36fa0be26b9f.png)

## Checklist

- [ ] Tests updated (N/A)
- [ ] Documentation added (N/A)
- [x] `CHANGELOG.md` updated
  • Loading branch information
joeyorlando authored Mar 16, 2023
1 parent 1ccd529 commit 515f62a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
13 changes: 11 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,23 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v1.1.40 (2023-03-16)
## Unreleased

### Changed

- Updated wording in some Slack messages to use 'Alert Group' instead of 'Incident' ([1565](https://github.com/grafana/oncall/pull/1565))

### Fixed

- Check for duplicated positions in terraform escalation policies create/update
- Fix resolution note rendering in Slack message threads where the Slack username was not
being properly rendered ([1561](https://github.com/grafana/oncall/pull/1561))

## v1.1.40 (2023-03-16)

### Fixed

- Check for duplicated positions in terraform escalation policies create/update

### Added

- Add `regex_match` Jinja filter ([1556](https://github.com/grafana/oncall/pull/1556))
Expand Down
4 changes: 2 additions & 2 deletions engine/apps/slack/models/slack_message.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def send_slack_notification(self, user, alert_group, notification_policy):

slack_user_identity = user.slack_user_identity
if slack_user_identity is None:
text = "{}\nTried to invite {} to look at incident. Unfortunately {} is not in slack.".format(
text = "{}\nTried to invite {} to look at the alert group. Unfortunately {} is not in slack.".format(
alert_group.long_verbose_name, user_verbal, user_verbal
)

Expand All @@ -131,7 +131,7 @@ def send_slack_notification(self, user, alert_group, notification_policy):
notification_error_code=UserNotificationPolicyLogRecord.ERROR_NOTIFICATION_IN_SLACK_USER_NOT_IN_SLACK,
).save()
else:
text = "{}\nInviting {} to look at incident.".format(alert_group.long_verbose_name, user_verbal)
text = "{}\nInviting {} to look at the alert group.".format(alert_group.long_verbose_name, user_verbal)

blocks = [
{
Expand Down
2 changes: 1 addition & 1 deletion engine/apps/slack/scenarios/escalation_delivery.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ def get_user_notification_message_for_thread_for_usergroup(self, user, notificat
# Don't mention if asked to notify somehow else but drop a note for colleagues
user_mention_as = user_verbal
notify_by = " by {}".format(UserNotificationPolicy.NotificationChannel(notification_channel).label)
return "Inviting {}{} to look at incident.".format(user_mention_as, notify_by)
return "Inviting {}{} to look at the alert group.".format(user_mention_as, notify_by)

0 comments on commit 515f62a

Please sign in to comment.