Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

1 files changed, 13 insertions, 6 deletions

diff --git a/app/services/concerns/alert_management/alert_processing.rb b/app/services/concerns/alert_management/alert_processing.rb
index 9b15c5d7b4b..7b6f681fe3e 100644
--- a/app/services/concerns/alert_management/alert_processing.rb
+++ b/app/services/concerns/alert_management/alert_processing.rb
@@ -41,14 +41,21 @@ module AlertManagement
     end
 
     def process_resolved_alert
+      SystemNoteService.log_resolving_alert(alert, alert_source)
+
       return unless auto_close_incident?
-      return close_issue(alert.issue) if alert.resolve(incoming_payload.ends_at)
 
-      logger.warn(
-        message: 'Unable to update AlertManagement::Alert status to resolved',
-        project_id: project.id,
-        alert_id: alert.id
-      )
+      if alert.resolve(incoming_payload.ends_at)
+        SystemNoteService.change_alert_status(alert, User.alert_bot)
+
+        close_issue(alert.issue)
+      else
+        logger.warn(
+          message: 'Unable to update AlertManagement::Alert status to resolved',
+          project_id: project.id,
+          alert_id: alert.id
+        )
+      end
     end
 
     def process_firing_alert