Commit 0f5d90d2 authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'sy-system-note-recovery-alert-string-change' into 'master'

Prefer term 'recovery alert' for alert system notes

See merge request gitlab-org/gitlab!58513
parents 412fc188 43946861
......@@ -36,7 +36,7 @@ module Projects
override :alert_source
def alert_source
alert.monitoring_tool || integration&.name || 'Generic Alert Endpoint'
super || integration&.name || 'Generic Alert Endpoint'
end
def active_integration?
......
......@@ -73,7 +73,7 @@ module SystemNotes
#
# Returns the created Note object
def log_resolving_alert(monitoring_tool)
body = "logged a resolving alert from **#{monitoring_tool}**"
body = "logged a recovery alert from **#{monitoring_tool}**"
create_note(NoteSummary.new(noteable, project, User.alert_bot, body, action: 'new_alert_added'))
end
......
---
title: Update resolving alert system notes to use term Recovery Alert
merge_request: 58513
author:
type: changed
......@@ -69,7 +69,7 @@ RSpec.describe ::SystemNotes::AlertManagementService do
end
it 'has the appropriate message' do
expect(subject.note).to eq('logged a resolving alert from **Some Service**')
expect(subject.note).to eq('logged a recovery alert from **Some Service**')
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment