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
b72dae3f
Commit
b72dae3f
authored
Dec 01, 2021
by
Sean Arnold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add IssueCheckWorker for pending escalations
- Add to Schedule Check Cron worker - Add new queue to yml files
parent
1bd8f8e3
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
159 additions
and
10 deletions
+159
-10
config/sidekiq_queues.yml
config/sidekiq_queues.yml
+2
-0
ee/app/models/concerns/ee/issuable.rb
ee/app/models/concerns/ee/issuable.rb
+11
-0
ee/app/models/concerns/incident_management/base_pending_escalation.rb
...s/concerns/incident_management/base_pending_escalation.rb
+8
-0
ee/app/models/incident_management/pending_escalations/alert.rb
...p/models/incident_management/pending_escalations/alert.rb
+8
-0
ee/app/models/incident_management/pending_escalations/issue.rb
...p/models/incident_management/pending_escalations/issue.rb
+8
-0
ee/app/services/ee/issues/after_create_service.rb
ee/app/services/ee/issues/after_create_service.rb
+2
-2
ee/app/services/ee/notification_service.rb
ee/app/services/ee/notification_service.rb
+8
-0
ee/app/services/ee/system_note_service.rb
ee/app/services/ee/system_note_service.rb
+2
-2
ee/app/services/system_notes/escalations_service.rb
ee/app/services/system_notes/escalations_service.rb
+2
-2
ee/app/workers/all_queues.yml
ee/app/workers/all_queues.yml
+9
-0
ee/app/workers/incident_management/pending_escalations/issue_check_worker.rb
...dent_management/pending_escalations/issue_check_worker.rb
+24
-0
ee/app/workers/incident_management/pending_escalations/schedule_check_cron_worker.rb
...agement/pending_escalations/schedule_check_cron_worker.rb
+6
-1
ee/spec/models/concerns/ee/issuable_spec.rb
ee/spec/models/concerns/ee/issuable_spec.rb
+27
-0
ee/spec/workers/incident_management/pending_escalations/issue_check_worker_spec.rb
...management/pending_escalations/issue_check_worker_spec.rb
+34
-0
ee/spec/workers/incident_management/pending_escalations/schedule_check_cron_worker_spec.rb
...nt/pending_escalations/schedule_check_cron_worker_spec.rb
+8
-3
No files found.
config/sidekiq_queues.yml
View file @
b72dae3f
...
@@ -205,6 +205,8 @@
...
@@ -205,6 +205,8 @@
-
1
-
1
-
-
incident_management_pending_escalations_alert_create
-
-
incident_management_pending_escalations_alert_create
-
1
-
1
-
-
incident_management_pending_escalations_issue_check
-
1
-
-
integrations_create_external_cross_reference
-
-
integrations_create_external_cross_reference
-
1
-
1
-
-
invalid_gpg_signature_update
-
-
invalid_gpg_signature_update
...
...
ee/app/models/concerns/ee/issuable.rb
View file @
b72dae3f
...
@@ -27,6 +27,13 @@ module EE
...
@@ -27,6 +27,13 @@ module EE
supports_sla?
supports_sla?
end
end
def
escalation_policies_available?
return
false
unless
::
Feature
.
enabled?
(
:incident_escalations
,
project
)
return
false
unless
::
Gitlab
::
IncidentManagement
.
escalation_policies_available?
(
project
)
supports_escalation?
end
def
metric_images_available?
def
metric_images_available?
return
false
unless
IssuableMetricImage
.
available_for?
(
project
)
return
false
unless
IssuableMetricImage
.
available_for?
(
project
)
...
@@ -41,6 +48,10 @@ module EE
...
@@ -41,6 +48,10 @@ module EE
incident?
incident?
end
end
def
supports_escalation?
incident?
end
def
supports_iterations?
def
supports_iterations?
false
false
end
end
...
...
ee/app/models/concerns/incident_management/base_pending_escalation.rb
View file @
b72dae3f
...
@@ -28,6 +28,14 @@ module IncidentManagement
...
@@ -28,6 +28,14 @@ module IncidentManagement
scope
:processable
,
->
{
where
(
process_at:
ESCALATION_BUFFER
.
ago
..
Time
.
current
)
}
scope
:processable
,
->
{
where
(
process_at:
ESCALATION_BUFFER
.
ago
..
Time
.
current
)
}
delegate
:project
,
to: :target
delegate
:project
,
to: :target
def
escalatable
raise
NotImplementedError
end
def
type
raise
NotImplementedError
end
end
end
end
end
end
end
ee/app/models/incident_management/pending_escalations/alert.rb
View file @
b72dae3f
...
@@ -12,6 +12,14 @@ module IncidentManagement
...
@@ -12,6 +12,14 @@ module IncidentManagement
belongs_to
:alert
,
class_name:
'AlertManagement::Alert'
,
foreign_key:
'alert_id'
,
inverse_of: :pending_escalations
belongs_to
:alert
,
class_name:
'AlertManagement::Alert'
,
foreign_key:
'alert_id'
,
inverse_of: :pending_escalations
validates
:rule_id
,
uniqueness:
{
scope:
[
:alert_id
]
}
validates
:rule_id
,
uniqueness:
{
scope:
[
:alert_id
]
}
def
escalatable
alert
end
def
type
:alert
end
end
end
end
end
end
end
ee/app/models/incident_management/pending_escalations/issue.rb
View file @
b72dae3f
...
@@ -12,6 +12,14 @@ module IncidentManagement
...
@@ -12,6 +12,14 @@ module IncidentManagement
belongs_to
:issue
,
class_name:
'::Issue'
,
foreign_key:
'issue_id'
,
inverse_of: :pending_escalations
belongs_to
:issue
,
class_name:
'::Issue'
,
foreign_key:
'issue_id'
,
inverse_of: :pending_escalations
validates
:rule_id
,
uniqueness:
{
scope:
[
:issue_id
]
}
validates
:rule_id
,
uniqueness:
{
scope:
[
:issue_id
]
}
def
escalatable
issue
.
incident_management_issuable_escalation_status
end
def
type
:incident
end
end
end
end
end
end
end
ee/app/services/ee/issues/after_create_service.rb
View file @
b72dae3f
...
@@ -9,12 +9,12 @@ module EE
...
@@ -9,12 +9,12 @@ module EE
def
execute
(
issue
)
def
execute
(
issue
)
super
super
add
_issue_sla
(
issue
)
create
_issue_sla
(
issue
)
end
end
private
private
def
add
_issue_sla
(
issue
)
def
create
_issue_sla
(
issue
)
return
unless
issue
.
sla_available?
return
unless
issue
.
sla_available?
::
IncidentManagement
::
Incidents
::
CreateSlaService
.
new
(
issue
,
current_user
).
execute
::
IncidentManagement
::
Incidents
::
CreateSlaService
.
new
(
issue
,
current_user
).
execute
...
...
ee/app/services/ee/notification_service.rb
View file @
b72dae3f
...
@@ -76,6 +76,14 @@ module EE
...
@@ -76,6 +76,14 @@ module EE
end
end
end
end
def
notify_oncall_users_of_incident
(
users
,
issue
)
track_usage_event
(
:i_incident_management_oncall_notification_sent
,
users
.
map
(
&
:id
))
users
.
each
do
|
user
|
mailer
.
incident_escalation_fired_email
(
issue
.
project
,
user
,
issue
).
deliver_later
end
end
def
oncall_user_removed
(
rotation
,
user
,
async_notification
=
true
)
def
oncall_user_removed
(
rotation
,
user
,
async_notification
=
true
)
oncall_user_removed_recipients
(
rotation
,
user
).
each
do
|
recipient
|
oncall_user_removed_recipients
(
rotation
,
user
).
each
do
|
recipient
|
email
=
mailer
.
user_removed_from_rotation_email
(
user
,
rotation
,
[
recipient
])
email
=
mailer
.
user_removed_from_rotation_email
(
user
,
rotation
,
[
recipient
])
...
...
ee/app/services/ee/system_note_service.rb
View file @
b72dae3f
...
@@ -112,8 +112,8 @@ module EE
...
@@ -112,8 +112,8 @@ module EE
issuables_service
(
noteable
,
project
,
author
).
publish_issue_to_status_page
issuables_service
(
noteable
,
project
,
author
).
publish_issue_to_status_page
end
end
def
notify_via_escalation
(
noteable
,
project
,
recipients
,
escalation_policy
)
def
notify_via_escalation
(
noteable
,
project
,
recipients
,
escalation_policy
,
type
)
escalations_service
(
noteable
,
project
).
notify_via_escalation
(
recipients
,
escalation_policy:
escalation_policy
)
escalations_service
(
noteable
,
project
).
notify_via_escalation
(
recipients
,
escalation_policy:
escalation_policy
,
type:
type
)
end
end
private
private
...
...
ee/app/services/system_notes/escalations_service.rb
View file @
b72dae3f
...
@@ -8,8 +8,8 @@ module SystemNotes
...
@@ -8,8 +8,8 @@ module SystemNotes
@author
=
User
.
alert_bot
@author
=
User
.
alert_bot
end
end
def
notify_via_escalation
(
recipients
,
escalation_policy
:)
def
notify_via_escalation
(
recipients
,
escalation_policy
:
,
type
:
)
body
=
"notified
#{
recipients
.
map
(
&
:to_reference
).
to_sentence
}
of this
alert
via escalation policy **
#{
escalation_policy
.
name
}
**"
body
=
"notified
#{
recipients
.
map
(
&
:to_reference
).
to_sentence
}
of this
#{
type
}
via escalation policy **
#{
escalation_policy
.
name
}
**"
create_note
(
NoteSummary
.
new
(
noteable
,
project
,
author
,
body
,
action:
'new_alert_added'
))
create_note
(
NoteSummary
.
new
(
noteable
,
project
,
author
,
body
,
action:
'new_alert_added'
))
end
end
...
...
ee/app/workers/all_queues.yml
View file @
b72dae3f
...
@@ -1110,6 +1110,15 @@
...
@@ -1110,6 +1110,15 @@
:weight:
1
:weight:
1
:idempotent:
true
:idempotent:
true
:tags: []
:tags: []
-
:name: incident_management_pending_escalations_issue_check
:worker_name: IncidentManagement::PendingEscalations::IssueCheckWorker
:feature_category: :incident_management
:has_external_dependencies:
:urgency: :high
:resource_boundary: :cpu
:weight:
1
:idempotent:
true
:tags: []
-
:name: ldap_group_sync
-
:name: ldap_group_sync
:worker_name: LdapGroupSyncWorker
:worker_name: LdapGroupSyncWorker
:feature_category: :authentication_and_authorization
:feature_category: :authentication_and_authorization
...
...
ee/app/workers/incident_management/pending_escalations/issue_check_worker.rb
0 → 100644
View file @
b72dae3f
# frozen_string_literal: true
module
IncidentManagement
module
PendingEscalations
class
IssueCheckWorker
include
ApplicationWorker
data_consistency
:always
worker_resource_boundary
:cpu
urgency
:high
idempotent!
feature_category
:incident_management
def
perform
(
escalation_id
)
escalation
=
IncidentManagement
::
PendingEscalations
::
Issue
.
find_by_id
(
escalation_id
)
return
unless
escalation
IncidentManagement
::
PendingEscalations
::
ProcessService
.
new
(
escalation
).
execute
end
end
end
end
ee/app/workers/incident_management/pending_escalations/schedule_check_cron_worker.rb
View file @
b72dae3f
...
@@ -17,6 +17,11 @@ module IncidentManagement
...
@@ -17,6 +17,11 @@ module IncidentManagement
args
=
relation
.
pluck
(
:id
).
map
{
|
id
|
[
id
]
}
# rubocop:disable CodeReuse/ActiveRecord
args
=
relation
.
pluck
(
:id
).
map
{
|
id
|
[
id
]
}
# rubocop:disable CodeReuse/ActiveRecord
::
IncidentManagement
::
PendingEscalations
::
AlertCheckWorker
.
bulk_perform_async
(
args
)
# rubocop:disable Scalability/BulkPerformWithContext
::
IncidentManagement
::
PendingEscalations
::
AlertCheckWorker
.
bulk_perform_async
(
args
)
# rubocop:disable Scalability/BulkPerformWithContext
end
end
::
IncidentManagement
::
PendingEscalations
::
Issue
.
processable
.
each_batch
do
|
relation
|
args
=
relation
.
pluck
(
:id
).
map
{
|
id
|
[
id
]
}
# rubocop:disable CodeReuse/ActiveRecord
::
IncidentManagement
::
PendingEscalations
::
IssueCheckWorker
.
bulk_perform_async
(
args
)
# rubocop:disable Scalability/BulkPerformWithContext
end
end
end
end
end
end
end
...
...
ee/spec/models/concerns/ee/issuable_spec.rb
View file @
b72dae3f
...
@@ -108,4 +108,31 @@ RSpec.describe EE::Issuable do
...
@@ -108,4 +108,31 @@ RSpec.describe EE::Issuable do
it
{
is_expected
.
to
eq
(
supports_iterations
)
}
it
{
is_expected
.
to
eq
(
supports_iterations
)
}
end
end
end
end
describe
'#escalation_policies_available?'
do
where
(
:issuable_type
,
:incident_escalations_enabled
,
:oncall_schedules_enabled
,
:escalation_policies_enabled
,
:available
)
do
[
[
:issue
,
true
,
true
,
true
,
false
],
[
:incident
,
false
,
false
,
false
,
false
],
[
:incident
,
false
,
true
,
true
,
false
],
[
:incident
,
true
,
false
,
false
,
false
],
[
:incident
,
true
,
true
,
false
,
false
],
[
:incident
,
true
,
false
,
true
,
false
],
[
:incident
,
true
,
true
,
true
,
true
]
]
end
with_them
do
let
(
:issuable
)
{
build_stubbed
(
issuable_type
)
}
before
do
stub_feature_flags
(
incident_escalations:
incident_escalations_enabled
)
stub_licensed_features
(
oncall_schedules:
oncall_schedules_enabled
,
escalation_policies:
escalation_policies_enabled
)
end
subject
{
issuable
.
escalation_policies_available?
}
it
{
is_expected
.
to
eq
(
available
)
}
end
end
end
end
ee/spec/workers/incident_management/pending_escalations/issue_check_worker_spec.rb
0 → 100644
View file @
b72dae3f
# frozen_string_literal: true
require
'spec_helper'
RSpec
.
describe
IncidentManagement
::
PendingEscalations
::
IssueCheckWorker
do
let
(
:worker
)
{
described_class
.
new
}
let_it_be
(
:escalation
)
{
create
(
:incident_management_pending_issue_escalation
)
}
describe
'#perform'
do
subject
{
worker
.
perform
(
*
args
)
}
context
'with valid escalation'
do
let
(
:args
)
{
[
escalation
.
id
.
to_s
]
}
it
'processes the escalation'
do
expect_next_instance_of
(
IncidentManagement
::
PendingEscalations
::
ProcessService
,
escalation
)
do
|
service
|
expect
(
service
).
to
receive
(
:execute
)
end
subject
end
end
context
'without valid escalation'
do
let
(
:args
)
{
[
non_existing_record_id
]
}
it
'does nothing'
do
expect
(
IncidentManagement
::
PendingEscalations
::
CreateService
).
not_to
receive
(
:new
)
expect
{
subject
}.
not_to
raise_error
end
end
end
end
ee/spec/workers/incident_management/pending_escalations/schedule_check_cron_worker_spec.rb
View file @
b72dae3f
...
@@ -5,8 +5,10 @@ require 'spec_helper'
...
@@ -5,8 +5,10 @@ require 'spec_helper'
RSpec
.
describe
IncidentManagement
::
PendingEscalations
::
ScheduleCheckCronWorker
do
RSpec
.
describe
IncidentManagement
::
PendingEscalations
::
ScheduleCheckCronWorker
do
let
(
:worker
)
{
described_class
.
new
}
let
(
:worker
)
{
described_class
.
new
}
let_it_be
(
:escalation_1
)
{
create
(
:incident_management_pending_alert_escalation
,
process_at:
5
.
minutes
.
ago
)
}
let_it_be
(
:alert_escalation_1
)
{
create
(
:incident_management_pending_alert_escalation
,
process_at:
5
.
minutes
.
ago
)
}
let_it_be
(
:escalation_2
)
{
create
(
:incident_management_pending_alert_escalation
,
process_at:
2
.
days
.
ago
)
}
let_it_be
(
:alert_escalation_2
)
{
create
(
:incident_management_pending_alert_escalation
,
process_at:
2
.
days
.
ago
)
}
let_it_be
(
:issue_escalation_1
)
{
create
(
:incident_management_pending_issue_escalation
,
process_at:
2
.
days
.
ago
)
}
let_it_be
(
:issue_escalation_2
)
{
create
(
:incident_management_pending_issue_escalation
,
process_at:
2
.
days
.
ago
)
}
let_it_be
(
:escalation_not_ready_to_process
)
{
create
(
:incident_management_pending_alert_escalation
)
}
let_it_be
(
:escalation_not_ready_to_process
)
{
create
(
:incident_management_pending_alert_escalation
)
}
describe
'#perform'
do
describe
'#perform'
do
...
@@ -14,7 +16,10 @@ RSpec.describe IncidentManagement::PendingEscalations::ScheduleCheckCronWorker d
...
@@ -14,7 +16,10 @@ RSpec.describe IncidentManagement::PendingEscalations::ScheduleCheckCronWorker d
it
'schedules a job for each processable escalation'
do
it
'schedules a job for each processable escalation'
do
expect
(
IncidentManagement
::
PendingEscalations
::
AlertCheckWorker
).
to
receive
(
:bulk_perform_async
)
expect
(
IncidentManagement
::
PendingEscalations
::
AlertCheckWorker
).
to
receive
(
:bulk_perform_async
)
.
with
(
array_including
([
escalation_2
.
id
],
[
escalation_1
.
id
]))
.
with
(
array_including
([
alert_escalation_2
.
id
],
[
alert_escalation_1
.
id
]))
expect
(
IncidentManagement
::
PendingEscalations
::
IssueCheckWorker
).
to
receive
(
:bulk_perform_async
)
.
with
(
array_including
([
issue_escalation_2
.
id
],
[
issue_escalation_1
.
id
]))
subject
subject
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