Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 0 deletions

diff --git a/lib/gitlab/alert_management/payload/base.rb b/lib/gitlab/alert_management/payload/base.rb
index 2d769148c5f..01dcb95eab5 100644
--- a/lib/gitlab/alert_management/payload/base.rb
+++ b/lib/gitlab/alert_management/payload/base.rb
@@ -149,6 +149,10 @@ module Gitlab
           severity_mapping.fetch(severity_raw.to_s.downcase, UNMAPPED_SEVERITY)
         end
 
+        def source
+          monitoring_tool || integration&.name
+        end
+
         private
 
         def plain_gitlab_fingerprint
diff --git a/lib/gitlab/alert_management/payload/generic.rb b/lib/gitlab/alert_management/payload/generic.rb
index 15238b5e50f..18e65779ead 100644
--- a/lib/gitlab/alert_management/payload/generic.rb
+++ b/lib/gitlab/alert_management/payload/generic.rb
@@ -6,6 +6,7 @@ module Gitlab
     module Payload
       class Generic < Base
         DEFAULT_TITLE = 'New: Alert'
+        DEFAULT_SOURCE = 'Generic Alert Endpoint'
 
         attribute :description, paths: 'description'
         attribute :ends_at, paths: 'end_time', type: :time
@@ -22,6 +23,14 @@ module Gitlab
 
         attribute :plain_gitlab_fingerprint, paths: 'fingerprint'
         private :plain_gitlab_fingerprint
+
+        def resolved?
+          ends_at.present?
+        end
+
+        def source
+          super || DEFAULT_SOURCE
+        end
       end
     end
   end