Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
43946861
Commit
43946861
authored
Apr 02, 2021
by
syasonik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prefer term 'recovery alert' for alert system notes
parent
e08e3da9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
app/services/projects/alerting/notify_service.rb
app/services/projects/alerting/notify_service.rb
+1
-1
app/services/system_notes/alert_management_service.rb
app/services/system_notes/alert_management_service.rb
+1
-1
changelogs/unreleased/sy-system-note-recovery-alert-string-change.yml
...nreleased/sy-system-note-recovery-alert-string-change.yml
+5
-0
spec/services/system_notes/alert_management_service_spec.rb
spec/services/system_notes/alert_management_service_spec.rb
+1
-1
No files found.
app/services/projects/alerting/notify_service.rb
View file @
43946861
...
@@ -36,7 +36,7 @@ module Projects
...
@@ -36,7 +36,7 @@ module Projects
override
:alert_source
override
:alert_source
def
alert_source
def
alert_source
alert
.
monitoring_tool
||
integration
&
.
name
||
'Generic Alert Endpoint'
super
||
integration
&
.
name
||
'Generic Alert Endpoint'
end
end
def
active_integration?
def
active_integration?
...
...
app/services/system_notes/alert_management_service.rb
View file @
43946861
...
@@ -73,7 +73,7 @@ module SystemNotes
...
@@ -73,7 +73,7 @@ module SystemNotes
#
#
# Returns the created Note object
# Returns the created Note object
def
log_resolving_alert
(
monitoring_tool
)
def
log_resolving_alert
(
monitoring_tool
)
body
=
"logged a re
solving
alert from **
#{
monitoring_tool
}
**"
body
=
"logged a re
covery
alert from **
#{
monitoring_tool
}
**"
create_note
(
NoteSummary
.
new
(
noteable
,
project
,
User
.
alert_bot
,
body
,
action:
'new_alert_added'
))
create_note
(
NoteSummary
.
new
(
noteable
,
project
,
User
.
alert_bot
,
body
,
action:
'new_alert_added'
))
end
end
...
...
changelogs/unreleased/sy-system-note-recovery-alert-string-change.yml
0 → 100644
View file @
43946861
---
title
:
Update resolving alert system notes to use term Recovery Alert
merge_request
:
58513
author
:
type
:
changed
spec/services/system_notes/alert_management_service_spec.rb
View file @
43946861
...
@@ -69,7 +69,7 @@ RSpec.describe ::SystemNotes::AlertManagementService do
...
@@ -69,7 +69,7 @@ RSpec.describe ::SystemNotes::AlertManagementService do
end
end
it
'has the appropriate message'
do
it
'has the appropriate message'
do
expect
(
subject
.
note
).
to
eq
(
'logged a re
solving
alert from **Some Service**'
)
expect
(
subject
.
note
).
to
eq
(
'logged a re
covery
alert from **Some Service**'
)
end
end
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment