From cb48842e499c263b7ea94d5f07f58da9ff327a5f Mon Sep 17 00:00:00 2001 From: Matias Bordese Date: Thu, 8 Feb 2024 12:04:35 -0300 Subject: [PATCH] Update escalation step wording (#3854) Fixes https://github.com/grafana/oncall/issues/3828 (was debugging some code around, simple update) --- engine/apps/alerts/models/escalation_policy.py | 2 +- engine/apps/base/models/user_notification_policy_log_record.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/apps/alerts/models/escalation_policy.py b/engine/apps/alerts/models/escalation_policy.py index 239e9367..a7f58839 100644 --- a/engine/apps/alerts/models/escalation_policy.py +++ b/engine/apps/alerts/models/escalation_policy.py @@ -117,7 +117,7 @@ class EscalationPolicy(OrderedModel): "Start {{importance}} notification for schedule {{schedule}}", "Notify users from on-call schedule", ), - STEP_FINAL_RESOLVE: ("Resolve incident automatically", "Resolve incident automatically"), + STEP_FINAL_RESOLVE: ("Resolve alert group automatically", "Resolve alert group automatically"), # Slack STEP_FINAL_NOTIFYALL: ("Notify whole Slack channel", "Notify whole Slack channel"), STEP_NOTIFY_GROUP: ( diff --git a/engine/apps/base/models/user_notification_policy_log_record.py b/engine/apps/base/models/user_notification_policy_log_record.py index a2383c54..f219857c 100644 --- a/engine/apps/base/models/user_notification_policy_log_record.py +++ b/engine/apps/base/models/user_notification_policy_log_record.py @@ -203,7 +203,7 @@ class UserNotificationPolicyLogRecord(models.Model): self.notification_error_code == UserNotificationPolicyLogRecord.ERROR_NOTIFICATION_POSTING_TO_SLACK_IS_DISABLED ): - result += f"failed to notify {user_verbal} in Slack, because the incident is not posted to Slack (reason: Slack is disabled for the route)" + result += f"failed to notify {user_verbal} in Slack (reason: {self.reason})" elif ( self.notification_error_code == UserNotificationPolicyLogRecord.ERROR_NOTIFICATION_POSTING_TO_TELEGRAM_IS_DISABLED