Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 46 deletions

diff --git a/lib/gitlab/alert_management/alert_params.rb b/lib/gitlab/alert_management/alert_params.rb
deleted file mode 100644
index 3bb839c1114..00000000000
--- a/lib/gitlab/alert_management/alert_params.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module AlertManagement
-    class AlertParams
-      MONITORING_TOOLS = {
-        prometheus: 'Prometheus'
-      }.freeze
-
-      def self.from_generic_alert(project:, payload:)
-        parsed_payload = Gitlab::Alerting::NotificationPayloadParser.call(payload, project).with_indifferent_access
-        annotations = parsed_payload[:annotations]
-
-        {
-          project_id: project.id,
-          title: annotations[:title],
-          description: annotations[:description],
-          monitoring_tool: annotations[:monitoring_tool],
-          service: annotations[:service],
-          hosts: Array(annotations[:hosts]),
-          payload: payload,
-          started_at: parsed_payload['startsAt'],
-          ended_at: parsed_payload['endsAt'],
-          severity: annotations[:severity],
-          fingerprint: annotations[:fingerprint],
-          environment: annotations[:environment]
-        }
-      end
-
-      def self.from_prometheus_alert(project:, parsed_alert:)
-        {
-          project_id: project.id,
-          title: parsed_alert.title,
-          description: parsed_alert.description,
-          monitoring_tool: MONITORING_TOOLS[:prometheus],
-          payload: parsed_alert.payload,
-          started_at: parsed_alert.starts_at,
-          ended_at: parsed_alert.ends_at,
-          fingerprint: parsed_alert.gitlab_fingerprint,
-          environment: parsed_alert.environment,
-          prometheus_alert: parsed_alert.gitlab_alert
-        }
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/alert_management/payload/generic.rb b/lib/gitlab/alert_management/payload/generic.rb
index 7efdfac75dc..e8e85155bef 100644
--- a/lib/gitlab/alert_management/payload/generic.rb
+++ b/lib/gitlab/alert_management/payload/generic.rb
@@ -8,6 +8,8 @@ module Gitlab
         DEFAULT_TITLE = 'New: Incident'
         DEFAULT_SEVERITY = 'critical'
 
+        attribute :description, paths: 'description'
+        attribute :ends_at, paths: 'end_time', type: :time
         attribute :environment_name, paths: 'gitlab_environment_name'
         attribute :hosts, paths: 'hosts'
         attribute :monitoring_tool, paths: 'monitoring_tool'
@@ -23,3 +25,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::AlertManagement::Payload::Generic.prepend_if_ee('EE::Gitlab::AlertManagement::Payload::Generic')