Add latest changes from gitlab-org/gitlab@master

4 files changed, 23 insertions, 11 deletions

diff --git a/lib/gitlab/alert_management/alert_params.rb b/lib/gitlab/alert_management/alert_params.rb
index 84a75e62ecf..0edc77efa10 100644
--- a/lib/gitlab/alert_management/alert_params.rb
+++ b/lib/gitlab/alert_management/alert_params.rb
@@ -21,7 +21,8 @@ module Gitlab
           payload: payload,
           started_at: parsed_payload['startsAt'],
           severity: annotations[:severity],
-          fingerprint: annotations[:fingerprint]
+          fingerprint: annotations[:fingerprint],
+          environment: annotations[:environment]
         }
       end
 
diff --git a/lib/gitlab/alerting/notification_payload_parser.rb b/lib/gitlab/alerting/notification_payload_parser.rb
index f285dcf507f..ce04205a1ba 100644
--- a/lib/gitlab/alerting/notification_payload_parser.rb
+++ b/lib/gitlab/alerting/notification_payload_parser.rb
@@ -55,7 +55,8 @@ module Gitlab
           'service' => payload[:service],
           'hosts' => hosts.presence,
           'severity' => severity,
-          'fingerprint' => fingerprint
+          'fingerprint' => fingerprint,
+          'environment' => environment
         }
       end
 
@@ -73,6 +74,16 @@ module Gitlab
         current_time
       end
 
+      def environment
+        environment_name = payload[:gitlab_environment_name]
+
+        return unless environment_name
+
+        EnvironmentsFinder.new(project, nil, { name: environment_name })
+          .find
+          &.first
+      end
+
       def secondary_params
         payload.except(:start_time)
       end
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index 70efe86143e..f4d3186657f 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -604,27 +604,27 @@ module Gitlab
       end
 
       def action_monthly_active_users(time_period)
-        counter = Gitlab::UsageDataCounters::TrackUniqueActions
+        counter = Gitlab::UsageDataCounters::TrackUniqueEvents
 
         project_count = redis_usage_data do
-          counter.count_unique(
-            event_action: Gitlab::UsageDataCounters::TrackUniqueActions::PUSH_ACTION,
+          counter.count_unique_events(
+            event_action: Gitlab::UsageDataCounters::TrackUniqueEvents::PUSH_ACTION,
             date_from: time_period[:created_at].first,
             date_to: time_period[:created_at].last
           )
         end
 
         design_count = redis_usage_data do
-          counter.count_unique(
-            event_action: Gitlab::UsageDataCounters::TrackUniqueActions::DESIGN_ACTION,
+          counter.count_unique_events(
+            event_action: Gitlab::UsageDataCounters::TrackUniqueEvents::DESIGN_ACTION,
             date_from: time_period[:created_at].first,
             date_to: time_period[:created_at].last
           )
         end
 
         wiki_count = redis_usage_data do
-          counter.count_unique(
-            event_action: Gitlab::UsageDataCounters::TrackUniqueActions::WIKI_ACTION,
+          counter.count_unique_events(
+            event_action: Gitlab::UsageDataCounters::TrackUniqueEvents::WIKI_ACTION,
             date_from: time_period[:created_at].first,
             date_to: time_period[:created_at].last
           )
diff --git a/lib/gitlab/usage_data_counters/track_unique_actions.rb b/lib/gitlab/usage_data_counters/track_unique_events.rb
index 0df982572a4..db18200f059 100644
--- a/lib/gitlab/usage_data_counters/track_unique_actions.rb
+++ b/lib/gitlab/usage_data_counters/track_unique_events.rb
@@ -2,7 +2,7 @@
 
 module Gitlab
   module UsageDataCounters
-    module TrackUniqueActions
+    module TrackUniqueEvents
       KEY_EXPIRY_LENGTH = 29.days
 
       WIKI_ACTION = :wiki_action
@@ -38,7 +38,7 @@ module Gitlab
           Gitlab::Redis::HLL.add(key: target_key, value: author_id, expiry: KEY_EXPIRY_LENGTH)
         end
 
-        def count_unique(event_action:, date_from:, date_to:)
+        def count_unique_events(event_action:, date_from:, date_to:)
           keys = (date_from.to_date..date_to.to_date).map { |date| key(event_action, date) }
 
           Gitlab::Redis::HLL.count(keys: keys)