Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

6 files changed, 25 insertions, 31 deletions

diff --git a/lib/gitlab/usage_data_counters/editor_unique_counter.rb b/lib/gitlab/usage_data_counters/editor_unique_counter.rb
index f97ebdccecf..8feb24e49ac 100644
--- a/lib/gitlab/usage_data_counters/editor_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/editor_unique_counter.rb
@@ -6,7 +6,6 @@ module Gitlab
       EDIT_BY_SNIPPET_EDITOR = 'g_edit_by_snippet_ide'
       EDIT_BY_SFE = 'g_edit_by_sfe'
       EDIT_BY_WEB_IDE = 'g_edit_by_web_ide'
-      EDIT_BY_SSE = 'g_edit_by_sse'
       EDIT_CATEGORY = 'ide_edit'
       EDIT_BY_LIVE_PREVIEW = 'g_edit_by_live_preview'
 
@@ -40,14 +39,6 @@ module Gitlab
           count_unique(events, date_from, date_to)
         end
 
-        def track_sse_edit_action(author:, time: Time.zone.now)
-          track_unique_action(EDIT_BY_SSE, author, time)
-        end
-
-        def count_sse_edit_actions(date_from:, date_to:)
-          count_unique(EDIT_BY_SSE, date_from, date_to)
-        end
-
         def track_live_preview_edit_action(author:, time: Time.zone.now)
           track_unique_action(EDIT_BY_LIVE_PREVIEW, author, time)
         end
diff --git a/lib/gitlab/usage_data_counters/known_events/code_review_events.yml b/lib/gitlab/usage_data_counters/known_events/code_review_events.yml
index e3bb3f6fef3..267b7fe673d 100644
--- a/lib/gitlab/usage_data_counters/known_events/code_review_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/code_review_events.yml
@@ -3,6 +3,10 @@
   redis_slot: code_review
   category: code_review
   aggregation: weekly
+- name: i_code_review_mr_with_invalid_approvers
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
 - name: i_code_review_user_single_file_diffs
   redis_slot: code_review
   category: code_review
diff --git a/lib/gitlab/usage_data_counters/known_events/common.yml b/lib/gitlab/usage_data_counters/known_events/common.yml
index 448ed4c66e1..0dcbaf59c9c 100644
--- a/lib/gitlab/usage_data_counters/known_events/common.yml
+++ b/lib/gitlab/usage_data_counters/known_events/common.yml
@@ -30,11 +30,6 @@
   redis_slot: edit
   expiry: 29
   aggregation: daily
-- name: g_edit_by_sse
-  category: ide_edit
-  redis_slot: edit
-  expiry: 29
-  aggregation: daily
 - name: g_edit_by_snippet_ide
   category: ide_edit
   redis_slot: edit
@@ -134,6 +129,19 @@
   redis_slot: incident_management
   category: incident_management
   aggregation: weekly
+# Incident management timeline events
+- name: incident_management_timeline_event_created
+  redis_slot: incident_management
+  category: incident_management
+  aggregation: weekly
+- name: incident_management_timeline_event_edited
+  redis_slot: incident_management
+  category: incident_management
+  aggregation: weekly
+- name: incident_management_timeline_event_deleted
+  redis_slot: incident_management
+  category: incident_management
+  aggregation: weekly
 # Incident management alerts
 - name: incident_management_alert_create_incident
   redis_slot: incident_management
@@ -144,7 +152,6 @@
   redis_slot: incident_management
   category: incident_management_oncall
   aggregation: weekly
-  feature_flag: usage_data_i_incident_management_oncall_notification_sent
 # Testing category
 - name: i_testing_test_case_parsed
   category: testing
diff --git a/lib/gitlab/usage_data_counters/known_events/quickactions.yml b/lib/gitlab/usage_data_counters/known_events/quickactions.yml
index 4ba7ea2d407..f980503b4bf 100644
--- a/lib/gitlab/usage_data_counters/known_events/quickactions.yml
+++ b/lib/gitlab/usage_data_counters/known_events/quickactions.yml
@@ -135,6 +135,10 @@
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
+- name: i_quickactions_ready
+  category: quickactions
+  redis_slot: quickactions
+  aggregation: weekly
 - name: i_quickactions_reassign
   category: quickactions
   redis_slot: quickactions
diff --git a/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb b/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb
index 0fadd68aeab..9c0f8fe9a80 100644
--- a/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb
@@ -250,3 +250,7 @@ module Gitlab
     end
   end
 end
+
+# rubocop:disable Layout/LineLength
+Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter.prepend_mod_with('Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter')
+# rubocop:enable Layout/LineLength
diff --git a/lib/gitlab/usage_data_counters/static_site_editor_counter.rb b/lib/gitlab/usage_data_counters/static_site_editor_counter.rb
deleted file mode 100644
index 3c5989d1e11..00000000000
--- a/lib/gitlab/usage_data_counters/static_site_editor_counter.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module UsageDataCounters
-    class StaticSiteEditorCounter < BaseCounter
-      KNOWN_EVENTS = %w[views commits merge_requests].freeze
-      PREFIX = 'static_site_editor'
-
-      class << self
-        def increment_views_count
-          count(:views)
-        end
-      end
-    end
-  end
-end