Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 5 deletions

diff --git a/app/services/alert_management/process_prometheus_alert_service.rb b/app/services/alert_management/process_prometheus_alert_service.rb
index e0594247975..556f04e8786 100644
--- a/app/services/alert_management/process_prometheus_alert_service.rb
+++ b/app/services/alert_management/process_prometheus_alert_service.rb
@@ -6,9 +6,10 @@ module AlertManagement
     include ::AlertManagement::AlertProcessing
     include ::AlertManagement::Responses
 
-    def initialize(project, payload)
+    def initialize(project, payload, integration: nil)
       @project = project
       @payload = payload
+      @integration = integration
     end
 
     def execute
@@ -24,7 +25,7 @@ module AlertManagement
 
     private
 
-    attr_reader :project, :payload
+    attr_reader :project, :payload, :integration
 
     override :incoming_payload
     def incoming_payload
@@ -32,6 +33,7 @@ module AlertManagement
         Gitlab::AlertManagement::Payload.parse(
           project,
           payload,
+          integration: integration,
           monitoring_tool: Gitlab::AlertManagement::Payload::MONITORING_TOOLS[:prometheus]
         )
       end
diff --git a/app/services/projects/prometheus/alerts/notify_service.rb b/app/services/projects/prometheus/alerts/notify_service.rb
index 1d24a113e05..f1c093c89b7 100644
--- a/app/services/projects/prometheus/alerts/notify_service.rb
+++ b/app/services/projects/prometheus/alerts/notify_service.rb
@@ -36,7 +36,7 @@ module Projects
 
           truncate_alerts! if max_alerts_exceeded?
 
-          process_prometheus_alerts
+          process_prometheus_alerts(integration)
 
           created
         end
@@ -151,10 +151,10 @@ module Projects
           ActiveSupport::SecurityUtils.secure_compare(expected, actual)
         end
 
-        def process_prometheus_alerts
+        def process_prometheus_alerts(integration)
           alerts.map do |alert|
             AlertManagement::ProcessPrometheusAlertService
-              .new(project, alert)
+              .new(project, alert, integration: integration)
               .execute
           end
         end