Add latest changes from gitlab-org/gitlab@13-2-stable-ee

2 files changed, 16 insertions, 6 deletions

diff --git a/lib/gitlab/alert_management/alert_params.rb b/lib/gitlab/alert_management/alert_params.rb
index 789a4fe246a..84a75e62ecf 100644
--- a/lib/gitlab/alert_management/alert_params.rb
+++ b/lib/gitlab/alert_management/alert_params.rb
@@ -8,7 +8,7 @@ module Gitlab
       }.freeze
 
       def self.from_generic_alert(project:, payload:)
-        parsed_payload = Gitlab::Alerting::NotificationPayloadParser.call(payload).with_indifferent_access
+        parsed_payload = Gitlab::Alerting::NotificationPayloadParser.call(payload, project).with_indifferent_access
         annotations = parsed_payload[:annotations]
 
         {
@@ -34,7 +34,9 @@ module Gitlab
           payload: parsed_alert.payload,
           started_at: parsed_alert.starts_at,
           ended_at: parsed_alert.ends_at,
-          fingerprint: parsed_alert.gitlab_fingerprint
+          fingerprint: parsed_alert.gitlab_fingerprint,
+          environment: parsed_alert.environment,
+          prometheus_alert: parsed_alert.gitlab_alert
         }
       end
     end
diff --git a/lib/gitlab/alert_management/fingerprint.rb b/lib/gitlab/alert_management/fingerprint.rb
index 6ab47c88ca1..d7842d3b37d 100644
--- a/lib/gitlab/alert_management/fingerprint.rb
+++ b/lib/gitlab/alert_management/fingerprint.rb
@@ -10,11 +10,14 @@ module Gitlab
       def generate(data)
         return unless data.present?
 
-        if data.is_a?(Array)
-          data = flatten_array(data)
-        end
+        string = case data
+                 when Array then flatten_array(data)
+                 when Hash then flatten_hash(data)
+                 else
+                   data.to_s
+                 end
 
-        Digest::SHA1.hexdigest(data.to_s)
+        Digest::SHA1.hexdigest(string)
       end
 
       private
@@ -22,6 +25,11 @@ module Gitlab
       def flatten_array(array)
         array.flatten.map!(&:to_s).join
       end
+
+      def flatten_hash(hash)
+        # Sort hash so SHA generated is the same
+        Gitlab::Utils::SafeInlineHash.merge_keys!(hash).sort.to_s
+      end
     end
   end
 end