Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

1 files changed, 7 insertions, 87 deletions

diff --git a/app/services/projects/alerting/notify_service.rb b/app/services/projects/alerting/notify_service.rb
index 014fb0e3ed3..2ba64b73699 100644
--- a/app/services/projects/alerting/notify_service.rb
+++ b/app/services/projects/alerting/notify_service.rb
@@ -3,9 +3,8 @@
 module Projects
   module Alerting
     class NotifyService
-      include BaseServiceUtility
-      include Gitlab::Utils::StrongMemoize
-      include ::IncidentManagement::Settings
+      extend ::Gitlab::Utils::Override
+      include ::AlertManagement::AlertProcessing
 
       def initialize(project, payload)
         @project = project
@@ -22,8 +21,7 @@ module Projects
         process_alert
         return bad_request unless alert.persisted?
 
-        process_incident_issues if process_issues?
-        send_alert_email if send_email?
+        complete_post_processing_tasks
 
         ServiceResponse.success
       end
@@ -32,93 +30,15 @@ module Projects
 
       attr_reader :project, :payload, :integration
 
-      def process_alert
-        if alert.persisted?
-          process_existing_alert
-        else
-          create_alert
-        end
-      end
-
-      def process_existing_alert
-        if incoming_payload.ends_at.present?
-          process_resolved_alert
-        else
-          alert.register_new_event!
-        end
-
-        alert
-      end
-
-      def process_resolved_alert
-        return unless auto_close_incident?
-
-        if alert.resolve(incoming_payload.ends_at)
-          close_issue(alert.issue)
-        end
-
-        alert
-      end
-
-      def close_issue(issue)
-        return if issue.blank? || issue.closed?
-
-        ::Issues::CloseService
-          .new(project, User.alert_bot)
-          .execute(issue, system_note: false)
-
-        SystemNoteService.auto_resolve_prometheus_alert(issue, project, User.alert_bot) if issue.reset.closed?
-      end
-
-      def create_alert
-        return unless alert.save
-
-        alert.execute_services
-        SystemNoteService.create_new_alert(alert, notification_source)
-      end
-
-      def process_incident_issues
-        return if alert.issue || alert.resolved?
-
-        ::IncidentManagement::ProcessAlertWorker.perform_async(nil, nil, alert.id)
-      end
-
-      def send_alert_email
-        notification_service
-          .async
-          .prometheus_alerts_fired(project, [alert])
-      end
-
-      def alert
-        strong_memoize(:alert) do
-          existing_alert || new_alert
-        end
-      end
-
-      def existing_alert
-        return unless incoming_payload.gitlab_fingerprint
-
-        AlertManagement::Alert.not_resolved.for_fingerprint(project, incoming_payload.gitlab_fingerprint).first
-      end
-
-      def new_alert
-        AlertManagement::Alert.new(**incoming_payload.alert_params, ended_at: nil)
-      end
-
-      def incoming_payload
-        strong_memoize(:incoming_payload) do
-          Gitlab::AlertManagement::Payload.parse(project, payload.to_h)
-        end
+      def valid_payload_size?
+        Gitlab::Utils::DeepSize.new(payload).valid?
       end
 
-      def notification_source
+      override :alert_source
+      def alert_source
         alert.monitoring_tool || integration&.name || 'Generic Alert Endpoint'
       end
 
-      def valid_payload_size?
-        Gitlab::Utils::DeepSize.new(payload).valid?
-      end
-
       def active_integration?
         integration&.active?
       end