Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

9 files changed, 234 insertions, 47 deletions

diff --git a/lib/gitlab/usage_data_counters/hll_redis_counter.rb b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
index 40581bda81b..a5db8ba4dcc 100644
--- a/lib/gitlab/usage_data_counters/hll_redis_counter.rb
+++ b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
@@ -32,7 +32,6 @@ module Gitlab
         issues_edit
         pipeline_authoring
         quickactions
-        search
         user_packages
       ].freeze
 
@@ -42,7 +41,9 @@ module Gitlab
         ide_edit
         importer
         incident_management_alerts
+        kubernetes_agent
         pipeline_authoring
+        search
         secure
         snippets
         source_code
@@ -114,6 +115,10 @@ module Gitlab
           @categories ||= known_events.map { |event| event[:category] }.uniq
         end
 
+        def categories_collected_from_metrics_definitions
+          CATEGORIES_COLLECTED_FROM_METRICS_DEFINITIONS
+        end
+
         # @param category [String] the category name
         # @return [Array<String>] list of event names for given category
         def events_for_category(category)
@@ -163,11 +168,7 @@ module Gitlab
         private
 
         def categories_pending_migration
-          if ::Feature.enabled?(:use_redis_hll_instrumentation_classes)
-            (categories - CATEGORIES_COLLECTED_FROM_METRICS_DEFINITIONS)
-          else
-            categories
-          end
+          (categories - categories_collected_from_metrics_definitions)
         end
 
         def track(values, event_name, context: '', time: Time.zone.now)
diff --git a/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb b/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb
index 9d463e11772..316d9bb3dc1 100644
--- a/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb
@@ -4,6 +4,8 @@ module Gitlab
   module UsageDataCounters
     module IssueActivityUniqueCounter
       ISSUE_CATEGORY = 'issues_edit'
+      ISSUE_ACTION = 'perform_issue_action'
+      ISSUE_LABEL = 'redis_hll_counters.issues_edit.issues_edit_total_unique_counts_monthly'
 
       ISSUE_ASSIGNEE_CHANGED = 'g_project_management_issue_assignee_changed'
       ISSUE_CREATED = 'g_project_management_issue_created'
@@ -126,42 +128,48 @@ module Gitlab
           track_unique_action(ISSUE_TIME_SPENT_CHANGED, author)
         end
 
-        def track_issue_comment_added_action(author:)
+        def track_issue_comment_added_action(author:, project:)
+          track_snowplow_action(ISSUE_COMMENT_ADDED, author, project)
           track_unique_action(ISSUE_COMMENT_ADDED, author)
         end
 
-        def track_issue_comment_edited_action(author:)
+        def track_issue_comment_edited_action(author:, project:)
+          track_snowplow_action(ISSUE_COMMENT_EDITED, author, project)
           track_unique_action(ISSUE_COMMENT_EDITED, author)
         end
 
-        def track_issue_comment_removed_action(author:)
+        def track_issue_comment_removed_action(author:, project:)
+          track_snowplow_action(ISSUE_COMMENT_REMOVED, author, project)
           track_unique_action(ISSUE_COMMENT_REMOVED, author)
         end
 
-        def track_issue_cloned_action(author:)
+        def track_issue_cloned_action(author:, project:)
+          track_snowplow_action(ISSUE_CLONED, author, project)
           track_unique_action(ISSUE_CLONED, author)
         end
 
         private
 
-        def track_unique_action(action, author)
-          return unless author
-
-          Gitlab::UsageDataCounters::HLLRedisCounter.track_event(action, values: author.id)
-        end
-
         def track_snowplow_action(action, author, project)
-          return unless Feature.enabled?(:route_hll_to_snowplow_phase2, project&.namespace)
+          return unless Feature.enabled?(:route_hll_to_snowplow_phase2, project.namespace)
           return unless author
 
           Gitlab::Tracking.event(
             ISSUE_CATEGORY,
-            action.to_s,
+            ISSUE_ACTION,
+            label: ISSUE_LABEL,
+            property: action,
             project: project,
-            namespace: project&.namespace,
+            namespace: project.namespace,
             user: author
           )
         end
+
+        def track_unique_action(action, author)
+          return unless author
+
+          Gitlab::UsageDataCounters::HLLRedisCounter.track_event(action, values: author.id)
+        end
       end
     end
   end
diff --git a/lib/gitlab/usage_data_counters/known_events/ci_templates.yml b/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
index 3b883e505f8..a8f1bab1f20 100644
--- a/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
+++ b/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
@@ -147,6 +147,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_security_fortify_fod_sast
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_security_sast_iac_latest
   category: ci_templates
   redis_slot: ci_templates
@@ -639,6 +643,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_implicit_security_fortify_fod_sast
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_implicit_security_sast_iac_latest
   category: ci_templates
   redis_slot: ci_templates
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 267b7fe673d..c21b99ba834 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
@@ -299,3 +299,154 @@
   redis_slot: code_review
   category: code_review
   aggregation: weekly
+# MR Widget Extensions
+## Test Summary
+- name: i_code_review_merge_request_widget_test_summary_view
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_test_summary_full_report_clicked
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_test_summary_expand
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_test_summary_expand_success
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_test_summary_expand_warning
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_test_summary_expand_failed
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+## Accessibility
+- name: i_code_review_merge_request_widget_accessibility_view
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_accessibility_full_report_clicked
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_accessibility_expand
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_accessibility_expand_success
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_accessibility_expand_warning
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_accessibility_expand_failed
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+## Code Quality
+- name: i_code_review_merge_request_widget_code_quality_view
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_code_quality_full_report_clicked
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_code_quality_expand
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_code_quality_expand_success
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_code_quality_expand_warning
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_code_quality_expand_failed
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+## Terraform
+- name: i_code_review_merge_request_widget_terraform_view
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_terraform_full_report_clicked
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_terraform_expand
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_terraform_expand_success
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_terraform_expand_warning
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_terraform_expand_failed
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+## Metrics
+- name: i_code_review_merge_request_widget_metrics_view
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_metrics_full_report_clicked
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_metrics_expand
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_metrics_expand_success
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_metrics_expand_warning
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_metrics_expand_failed
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+## Status Checks
+- name: i_code_review_merge_request_widget_status_checks_view
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_status_checks_full_report_clicked
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_status_checks_expand
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_status_checks_expand_success
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_status_checks_expand_warning
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_merge_request_widget_status_checks_expand_failed
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
diff --git a/lib/gitlab/usage_data_counters/known_events/common.yml b/lib/gitlab/usage_data_counters/known_events/common.yml
index 88c9f44c165..6c4754ae19f 100644
--- a/lib/gitlab/usage_data_counters/known_events/common.yml
+++ b/lib/gitlab/usage_data_counters/known_events/common.yml
@@ -1,25 +1,5 @@
 ---
 # Compliance category
-- name: g_compliance_dashboard
-  redis_slot: compliance
-  category: compliance
-  aggregation: weekly
-- name: g_compliance_audit_events
-  category: compliance
-  redis_slot: compliance
-  aggregation: weekly
-- name: i_compliance_audit_events
-  category: compliance
-  redis_slot: compliance
-  aggregation: weekly
-- name: i_compliance_credential_inventory
-  category: compliance
-  redis_slot: compliance
-  aggregation: weekly
-- name: a_compliance_audit_events_api
-  category: compliance
-  redis_slot: compliance
-  aggregation: weekly
 - name: g_edit_by_web_ide
   category: ide_edit
   redis_slot: edit
@@ -44,14 +24,6 @@
   category: search
   redis_slot: search
   aggregation: weekly
-- name: i_search_advanced
-  category: search
-  redis_slot: search
-  aggregation: weekly
-- name: i_search_paid
-  category: search
-  redis_slot: search
-  aggregation: weekly
 - name: wiki_action
   category: source_code
   aggregation: daily
@@ -142,6 +114,19 @@
   redis_slot: incident_management
   category: incident_management
   aggregation: weekly
+# Incident management linked resources
+- name: incident_management_issuable_resource_link_created
+  redis_slot: incident_management
+  category: incident_management
+  aggregation: weekly
+- name: incident_management_issuable_resource_link_deleted
+  redis_slot: incident_management
+  category: incident_management
+  aggregation: weekly
+- name: incident_management_issuable_resource_link_visited
+  redis_slot: incident_management
+  category: incident_management
+  aggregation: weekly
 # Incident management alerts
 - name: incident_management_alert_create_incident
   redis_slot: incident_management
diff --git a/lib/gitlab/usage_data_counters/known_events/kubernetes_agent.yml b/lib/gitlab/usage_data_counters/known_events/kubernetes_agent.yml
new file mode 100644
index 00000000000..e1de74a3d07
--- /dev/null
+++ b/lib/gitlab/usage_data_counters/known_events/kubernetes_agent.yml
@@ -0,0 +1,5 @@
+- name: agent_users_using_ci_tunnel
+  category: kubernetes_agent
+  redis_slot: agent
+  aggregation: weekly
+  feature_flag: track_agent_users_using_ci_tunnel
diff --git a/lib/gitlab/usage_data_counters/known_events/work_items.yml b/lib/gitlab/usage_data_counters/known_events/work_items.yml
index 0c9c6026c46..6cd7836ea94 100644
--- a/lib/gitlab/usage_data_counters/known_events/work_items.yml
+++ b/lib/gitlab/usage_data_counters/known_events/work_items.yml
@@ -9,3 +9,8 @@
   redis_slot: users
   aggregation: weekly
   feature_flag: track_work_items_activity
+- name: users_updating_work_item_dates
+  category: work_items
+  redis_slot: users
+  aggregation: weekly
+  feature_flag: track_work_items_activity
diff --git a/lib/gitlab/usage_data_counters/merge_request_widget_extension_counter.rb b/lib/gitlab/usage_data_counters/merge_request_widget_extension_counter.rb
new file mode 100644
index 00000000000..dafc36ab7ce
--- /dev/null
+++ b/lib/gitlab/usage_data_counters/merge_request_widget_extension_counter.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module UsageDataCounters
+    class MergeRequestWidgetExtensionCounter < BaseCounter
+      KNOWN_EVENTS = %w[view full_report_clicked expand expand_success expand_warning expand_failed].freeze
+      PREFIX = 'i_code_review_merge_request_widget'
+      WIDGETS = %w[accessibility code_quality status_checks terraform test_summary metrics].freeze
+
+      class << self
+        private
+
+        def known_events
+          self::WIDGETS.product(self::KNOWN_EVENTS).map { |name_parts| name_parts.join('_count_') }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/usage_data_counters/work_item_activity_unique_counter.rb b/lib/gitlab/usage_data_counters/work_item_activity_unique_counter.rb
index 51bca8b51fe..99b4c082310 100644
--- a/lib/gitlab/usage_data_counters/work_item_activity_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/work_item_activity_unique_counter.rb
@@ -5,6 +5,7 @@ module Gitlab
     module WorkItemActivityUniqueCounter
       WORK_ITEM_CREATED = 'users_creating_work_items'
       WORK_ITEM_TITLE_CHANGED = 'users_updating_work_item_title'
+      WORK_ITEM_DATE_CHANGED = 'users_updating_work_item_dates'
 
       class << self
         def track_work_item_created_action(author:)
@@ -15,6 +16,10 @@ module Gitlab
           track_unique_action(WORK_ITEM_TITLE_CHANGED, author)
         end
 
+        def track_work_item_date_changed_action(author:)
+          track_unique_action(WORK_ITEM_DATE_CHANGED, author)
+        end
+
         private
 
         def track_unique_action(action, author)