Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

4 files changed, 24 insertions, 58 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/alert_status_counts.rb b/lib/gitlab/alert_management/alert_status_counts.rb
index 382026236e0..e55e0016599 100644
--- a/lib/gitlab/alert_management/alert_status_counts.rb
+++ b/lib/gitlab/alert_management/alert_status_counts.rb
@@ -6,8 +6,6 @@ module Gitlab
     class AlertStatusCounts
       include Gitlab::Utils::StrongMemoize
 
-      STATUSES = ::AlertManagement::Alert::STATUSES
-
       attr_reader :project
 
       def self.declarative_policy_class
@@ -21,7 +19,7 @@ module Gitlab
       end
 
       # Define method for each status
-      STATUSES.each_key do |status|
+      ::AlertManagement::Alert.status_names.each do |status|
         define_method(status) { counts[status] }
       end
 
@@ -30,7 +28,7 @@ module Gitlab
       end
 
       def all
-        counts.values.sum # rubocop:disable CodeReuse/ActiveRecord
+        counts.values.sum
       end
 
       private
@@ -44,9 +42,7 @@ module Gitlab
       end
 
       def counts_by_status
-        ::AlertManagement::AlertsFinder
-          .counts_by_status(current_user, project, params)
-          .transform_keys { |status_id| STATUSES.key(status_id) }
+        ::AlertManagement::AlertsFinder.counts_by_status(current_user, project, params)
       end
     end
   end
diff --git a/lib/gitlab/alert_management/payload/base.rb b/lib/gitlab/alert_management/payload/base.rb
index 74e47e5226e..0fd593a3780 100644
--- a/lib/gitlab/alert_management/payload/base.rb
+++ b/lib/gitlab/alert_management/payload/base.rb
@@ -88,19 +88,19 @@ module Gitlab
         # AlertManagement::Alert directly for read operations.
         def alert_params
           {
-            description: description,
+            description: description&.truncate(::AlertManagement::Alert::DESCRIPTION_MAX_LENGTH),
             ended_at: ends_at,
             environment: environment,
             fingerprint: gitlab_fingerprint,
-            hosts: Array(hosts),
-            monitoring_tool: monitoring_tool,
+            hosts: truncate_hosts(Array(hosts).flatten),
+            monitoring_tool: monitoring_tool&.truncate(::AlertManagement::Alert::TOOL_MAX_LENGTH),
             payload: payload,
             project_id: project.id,
             prometheus_alert: gitlab_alert,
-            service: service,
+            service: service&.truncate(::AlertManagement::Alert::SERVICE_MAX_LENGTH),
             severity: severity,
             started_at: starts_at,
-            title: title
+            title: title&.truncate(::AlertManagement::Alert::TITLE_MAX_LENGTH)
           }.transform_values(&:presence).compact
         end
 
@@ -135,6 +135,18 @@ module Gitlab
 
         def plain_gitlab_fingerprint; end
 
+        def truncate_hosts(hosts)
+          return hosts if hosts.join.length <= ::AlertManagement::Alert::HOSTS_MAX_LENGTH
+
+          hosts.inject([]) do |new_hosts, host|
+            remaining_length = ::AlertManagement::Alert::HOSTS_MAX_LENGTH - new_hosts.join.length
+
+            break new_hosts unless remaining_length > 0
+
+            new_hosts << host.to_s.truncate(remaining_length, omission: '')
+          end
+        end
+
         def value_for_paths(paths)
           target_path = paths.find { |path| payload&.dig(*path) }
 
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')