Add latest changes from gitlab-org/gitlab@master

2 files changed, 34 insertions, 0 deletions

diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index 3ee8901b23b..5e3ea162d20 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -1256,6 +1256,13 @@
   :resource_boundary: :unknown
   :weight: 1
   :idempotent: 
+- :name: prometheus_create_default_alerts
+  :feature_category: :incident_management
+  :has_external_dependencies: 
+  :urgency: :high
+  :resource_boundary: :unknown
+  :weight: 1
+  :idempotent: true
 - :name: propagate_service_template
   :feature_category: :source_code_management
   :has_external_dependencies: 
diff --git a/app/workers/prometheus/create_default_alerts_worker.rb b/app/workers/prometheus/create_default_alerts_worker.rb
new file mode 100644
index 00000000000..2c4fefa9ece
--- /dev/null
+++ b/app/workers/prometheus/create_default_alerts_worker.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Prometheus
+  class CreateDefaultAlertsWorker
+    include ApplicationWorker
+
+    feature_category :incident_management
+    urgency :high
+    idempotent!
+
+    def perform(project_id)
+      project = Project.find_by_id(project_id)
+
+      return unless project
+
+      result = Prometheus::CreateDefaultAlertsService.new(project: project).execute
+
+      log_info(result.message) if result.error?
+    end
+
+    private
+
+    def log_info(message)
+      logger.info(structured_payload(message: message))
+    end
+  end
+end