Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

9 files changed, 64 insertions, 524 deletions

diff --git a/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb b/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
index 61c071c8738..1e8918c7c96 100644
--- a/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
@@ -34,6 +34,21 @@ module Gitlab::UsageDataCounters
         Gitlab::Template::GitlabCiYmlTemplate.find(template_name.chomp('.gitlab-ci.yml'))&.full_name
       end
 
+      def all_included_templates(template_name)
+        expanded_template_name = expand_template_name(template_name)
+        results = [expanded_template_name].tap do |result|
+          template = Gitlab::Template::GitlabCiYmlTemplate.find(template_name.chomp('.gitlab-ci.yml'))
+          data = YAML.safe_load(template.content, aliases: true)
+          [data['include']].compact.flatten.each do |ci_include|
+            if ci_include_template = ci_include['template']
+              result.concat(all_included_templates(ci_include_template))
+            end
+          end
+        end
+
+        results.uniq.sort_by { _1['name'] }
+      end
+
       private
 
       def template_to_event_name(template)
diff --git a/lib/gitlab/usage_data_counters/hll_redis_counter.rb b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
index f0cb9bcbe94..24a87ae01f4 100644
--- a/lib/gitlab/usage_data_counters/hll_redis_counter.rb
+++ b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
@@ -19,18 +19,14 @@ module Gitlab
       ALLOWED_AGGREGATIONS = %i(daily weekly).freeze
 
       CATEGORIES_FOR_TOTALS = %w[
-        analytics
         compliance
-        epics_usage
         error_tracking
         ide_edit
-        incident_management
-        issues_edit
         pipeline_authoring
-        quickactions
       ].freeze
 
       CATEGORIES_COLLECTED_FROM_METRICS_DEFINITIONS = %w[
+        analytics
         ci_users
         deploy_token_packages
         code_review
@@ -38,9 +34,13 @@ module Gitlab
         error_tracking
         ide_edit
         importer
+        incident_management
         incident_management_alerts
+        issues_edit
         kubernetes_agent
+        manage
         pipeline_authoring
+        quickactions
         search
         secure
         snippets
diff --git a/lib/gitlab/usage_data_counters/known_events/analytics.yml b/lib/gitlab/usage_data_counters/known_events/analytics.yml
index 76c97a974d7..85524c766ca 100644
--- a/lib/gitlab/usage_data_counters/known_events/analytics.yml
+++ b/lib/gitlab/usage_data_counters/known_events/analytics.yml
@@ -10,54 +10,18 @@
   category: analytics
   redis_slot: analytics
   aggregation: weekly
-- name: p_analytics_merge_request
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
 - name: i_analytics_instance_statistics
   category: analytics
   redis_slot: analytics
   aggregation: weekly
-- name: g_analytics_contribution
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-- name: g_analytics_insights
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-- name: g_analytics_issues
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-- name: g_analytics_productivity
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-- name: g_analytics_valuestream
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
 - name: p_analytics_pipelines
   category: analytics
   redis_slot: analytics
   aggregation: weekly
-- name: p_analytics_code_reviews
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
 - name: p_analytics_valuestream
   category: analytics
   redis_slot: analytics
   aggregation: weekly
-- name: p_analytics_insights
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-- name: p_analytics_issues
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
 - name: p_analytics_repo
   category: analytics
   redis_slot: analytics
@@ -86,23 +50,3 @@
   category: analytics
   redis_slot: analytics
   aggregation: weekly
-- name: g_analytics_ci_cd_release_statistics
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-- name: g_analytics_ci_cd_deployment_frequency
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-- name: g_analytics_ci_cd_lead_time
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-- name: g_analytics_ci_cd_time_to_restore_service
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-- name: g_analytics_ci_cd_change_failure_rate
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
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 10e36a75a3a..5b80f6c6c0d 100644
--- a/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
+++ b/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
@@ -99,6 +99,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_security_coverage_fuzzing_latest
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_security_dast_on_demand_api_scan
   category: ci_templates
   redis_slot: ci_templates
@@ -499,27 +503,11 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_implicit_jobs_dast_default_branch_deploy
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_load_performance_testing
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_helm_2to3
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_sast
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_secret_detection
+- name: p_ci_templates_implicit_jobs_browser_performance_testing
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_implicit_jobs_license_scanning
+- name: p_ci_templates_implicit_jobs_build
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
@@ -531,47 +519,7 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_implicit_jobs_deploy_ecs
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_deploy_ec2
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_license_scanning_latest
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_deploy
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_build
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_browser_performance_testing
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_dependency_scanning_latest
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_test
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_sast_latest
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_sast_iac
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_secret_detection_latest
+- name: p_ci_templates_implicit_jobs_dast_default_branch_deploy
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
@@ -579,63 +527,35 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_implicit_jobs_deploy_latest
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_browser_performance_testing_latest
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_cf_provision
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_build_latest
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_jobs_sast_iac_latest
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_security_sast
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_security_dast_runner_validation
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_security_dast_on_demand_scan
+- name: p_ci_templates_implicit_jobs_deploy
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_implicit_security_secret_detection
+- name: p_ci_templates_implicit_jobs_deploy_ec2
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_implicit_security_license_scanning
+- name: p_ci_templates_implicit_jobs_deploy_ecs
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_implicit_security_dast_on_demand_api_scan
+- name: p_ci_templates_implicit_jobs_helm_2to3
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_implicit_security_coverage_fuzzing
+- name: p_ci_templates_implicit_jobs_license_scanning
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_implicit_security_api_fuzzing_latest
+- name: p_ci_templates_implicit_jobs_sast
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_implicit_security_secure_binaries
+- name: p_ci_templates_implicit_jobs_secret_detection
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_implicit_security_dast_api
+- name: p_ci_templates_implicit_jobs_test
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
@@ -643,11 +563,7 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_implicit_security_dast_latest
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_security_sast_iac
+- name: p_ci_templates_implicit_security_dast
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
@@ -655,27 +571,15 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_implicit_security_dast_api_latest
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_security_container_scanning_latest
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_security_api_fuzzing
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_implicit_security_dast
+- name: p_ci_templates_implicit_security_license_scanning
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_implicit_security_fortify_fod_sast
+- name: p_ci_templates_implicit_security_sast
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_implicit_security_sast_iac_latest
+- name: p_ci_templates_implicit_security_secret_detection
   category: ci_templates
   redis_slot: ci_templates
   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 29b231f88f8..c13c7657576 100644
--- a/lib/gitlab/usage_data_counters/known_events/common.yml
+++ b/lib/gitlab/usage_data_counters/known_events/common.yml
@@ -84,11 +84,6 @@
   redis_slot: incident_management
   category: incident_management
   aggregation: weekly
-- name: incident_management_incident_published
-  redis_slot: incident_management
-  category: incident_management
-  aggregation: weekly
-  feature_flag: usage_data_incident_management_incident_published
 - name: incident_management_incident_relate
   redis_slot: incident_management
   category: incident_management
@@ -114,29 +109,11 @@
   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
   category: incident_management_alerts
   aggregation: weekly
-# Incident management on-call
-- name: i_incident_management_oncall_notification_sent
-  redis_slot: incident_management
-  category: incident_management_oncall
-  aggregation: weekly
 # Testing category
 - name: i_testing_test_case_parsed
   category: testing
@@ -150,7 +127,6 @@
   category: testing
   redis_slot: testing
   aggregation: weekly
-  feature_flag: usage_data_ci_i_testing_test_report_uploaded
 # Project Management group
 - name: g_project_management_issue_title_changed
   category: issues_edit
@@ -192,14 +168,6 @@
   category: issues_edit
   redis_slot: project_management
   aggregation: daily
-- name: g_project_management_issue_iteration_changed
-  category: issues_edit
-  redis_slot: project_management
-  aggregation: daily
-- name: g_project_management_issue_weight_changed
-  category: issues_edit
-  redis_slot: project_management
-  aggregation: daily
 - name: g_project_management_issue_cross_referenced
   category: issues_edit
   redis_slot: project_management
@@ -228,18 +196,6 @@
   category: issues_edit
   redis_slot: project_management
   aggregation: daily
-- name: g_project_management_issue_added_to_epic
-  category: issues_edit
-  redis_slot: project_management
-  aggregation: daily
-- name: g_project_management_issue_removed_from_epic
-  category: issues_edit
-  redis_slot: project_management
-  aggregation: daily
-- name: g_project_management_issue_changed_epic
-  category: issues_edit
-  redis_slot: project_management
-  aggregation: daily
 - name: g_project_management_issue_designs_added
   category: issues_edit
   redis_slot: project_management
@@ -276,20 +232,11 @@
   category: issues_edit
   redis_slot: project_management
   aggregation: daily
-- name: g_project_management_issue_health_status_changed
-  category: issues_edit
-  redis_slot: project_management
-  aggregation: daily
 - name: g_project_management_issue_cloned
   category: issues_edit
   redis_slot: project_management
   aggregation: daily
 # Secrets Management
-- name: i_ci_secrets_management_vault_build_created
-  category: ci_secrets_management
-  redis_slot: ci_secrets_management
-  aggregation: weekly
-  feature_flag: usage_data_i_ci_secrets_management_vault_build_created
 - name: i_snippets_show
   category: snippets
   redis_slot: snippets
@@ -342,11 +289,6 @@
   category: geo
   redis_slot: geo
   aggregation: daily
-# Growth
-- name: users_clicking_registration_features_offer
-  category: growth
-  redis_slot: users
-  aggregation: weekly
 # Manage
 - name: unique_active_user
   category: manage
diff --git a/lib/gitlab/usage_data_counters/known_events/epic_events.yml b/lib/gitlab/usage_data_counters/known_events/epic_events.yml
deleted file mode 100644
index dd6625a9cc9..00000000000
--- a/lib/gitlab/usage_data_counters/known_events/epic_events.yml
+++ /dev/null
@@ -1,227 +0,0 @@
-# Epic events
-#
-# We are using the same slot of issue events 'project_management' for
-# epic events to allow data aggregation.
-# More information in: https://gitlab.com/gitlab-org/gitlab/-/issues/322405
-- name: g_project_management_epic_created
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-# content change events
-
-- name: project_management_users_unchecking_epic_task
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: project_management_users_checking_epic_task
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_users_updating_epic_titles
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_users_updating_epic_descriptions
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-# epic notes
-
-- name: g_project_management_users_creating_epic_notes
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_users_updating_epic_notes
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_users_destroying_epic_notes
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-# emoji
-
-- name: g_project_management_users_awarding_epic_emoji
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_users_removing_epic_emoji
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-# start date events
-
-- name: g_project_management_users_setting_epic_start_date_as_fixed
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_users_updating_fixed_epic_start_date
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_users_setting_epic_start_date_as_inherited
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-# due date events
-
-- name: g_project_management_users_setting_epic_due_date_as_fixed
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_users_updating_fixed_epic_due_date
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_users_setting_epic_due_date_as_inherited
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-# relationships
-
-- name: g_project_management_epic_issue_added
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_epic_issue_removed
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_epic_issue_moved_from_project
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_users_updating_epic_parent
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_epic_closed
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_epic_reopened
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: 'g_project_management_issue_promoted_to_epic'
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_users_setting_epic_confidential
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_users_setting_epic_visible
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_epic_users_changing_labels
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_epic_destroyed
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_epic_cross_referenced
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_users_epic_issue_added_from_epic
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_epic_related_added
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_epic_related_removed
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_epic_blocking_added
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_epic_blocking_removed
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_epic_blocked_added
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
-- name: g_project_management_epic_blocked_removed
-  category: epics_usage
-  redis_slot: project_management
-  aggregation: daily
-  feature_flag: track_epics_activity
-
diff --git a/lib/gitlab/usage_data_counters/known_events/quickactions.yml b/lib/gitlab/usage_data_counters/known_events/quickactions.yml
index 58a0c0695af..69b348b9a22 100644
--- a/lib/gitlab/usage_data_counters/known_events/quickactions.yml
+++ b/lib/gitlab/usage_data_counters/known_events/quickactions.yml
@@ -1,17 +1,17 @@
 ---
-- name: i_quickactions_approve
+- name: i_quickactions_assign_multiple
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-- name: i_quickactions_unapprove
+- name: i_quickactions_approve
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-- name: i_quickactions_assign_single
+- name: i_quickactions_unapprove
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-- name: i_quickactions_assign_multiple
+- name: i_quickactions_assign_single
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
@@ -31,18 +31,6 @@
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-- name: i_quickactions_child_epic
-  category: quickactions
-  redis_slot: quickactions
-  aggregation: weekly
-- name: i_quickactions_clear_weight
-  category: quickactions
-  redis_slot: quickactions
-  aggregation: weekly
-- name: i_quickactions_clear_health_status
-  category: quickactions
-  redis_slot: quickactions
-  aggregation: weekly
 - name: i_quickactions_clone
   category: quickactions
   redis_slot: quickactions
@@ -83,18 +71,10 @@
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-- name: i_quickactions_epic
-  category: quickactions
-  redis_slot: quickactions
-  aggregation: weekly
 - name: i_quickactions_estimate
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-- name: i_quickactions_iteration
-  category: quickactions
-  redis_slot: quickactions
-  aggregation: weekly
 - name: i_quickactions_label
   category: quickactions
   redis_slot: quickactions
@@ -115,14 +95,6 @@
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-- name: i_quickactions_parent_epic
-  category: quickactions
-  redis_slot: quickactions
-  aggregation: weekly
-- name: i_quickactions_promote
-  category: quickactions
-  redis_slot: quickactions
-  aggregation: weekly
 - name: i_quickactions_promote_to_incident
   category: quickactions
   redis_slot: quickactions
@@ -131,14 +103,6 @@
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-- name: i_quickactions_page
-  category: quickactions
-  redis_slot: quickactions
-  aggregation: weekly
-- name: i_quickactions_publish
-  category: quickactions
-  redis_slot: quickactions
-  aggregation: weekly
 - name: i_quickactions_ready
   category: quickactions
   redis_slot: quickactions
@@ -163,34 +127,18 @@
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-- name: i_quickactions_remove_child_epic
-  category: quickactions
-  redis_slot: quickactions
-  aggregation: weekly
 - name: i_quickactions_remove_due_date
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-- name: i_quickactions_remove_epic
-  category: quickactions
-  redis_slot: quickactions
-  aggregation: weekly
 - name: i_quickactions_remove_estimate
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-- name: i_quickactions_remove_iteration
-  category: quickactions
-  redis_slot: quickactions
-  aggregation: weekly
 - name: i_quickactions_remove_milestone
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-- name: i_quickactions_remove_parent_epic
-  category: quickactions
-  redis_slot: quickactions
-  aggregation: weekly
 - name: i_quickactions_remove_time_spent
   category: quickactions
   redis_slot: quickactions
@@ -275,19 +223,15 @@
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-- name: i_quickactions_weight
-  category: quickactions
-  redis_slot: quickactions
-  aggregation: weekly
-- name: i_quickactions_health_status
+- name: i_quickactions_wip
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-- name: i_quickactions_wip
+- name: i_quickactions_zoom
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-- name: i_quickactions_zoom
+- name: i_quickactions_link
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
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 6cd7836ea94..ee828fc0f72 100644
--- a/lib/gitlab/usage_data_counters/known_events/work_items.yml
+++ b/lib/gitlab/usage_data_counters/known_events/work_items.yml
@@ -14,3 +14,16 @@
   redis_slot: users
   aggregation: weekly
   feature_flag: track_work_items_activity
+- name: users_updating_work_item_labels
+  category: work_items
+  redis_slot: users
+  aggregation: weekly
+  feature_flag: track_work_items_activity
+- name: users_updating_work_item_iteration
+  # The event tracks an EE feature.
+  # It's added here so it can be aggregated into the CE/EE 'OR' aggregate metrics.
+  # It will report 0 for CE instances and should not be used with 'AND' aggregators.
+  category: work_items
+  redis_slot: users
+  aggregation: weekly
+  feature_flag: track_work_items_activity
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 99b4c082310..a0fd04596fc 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
@@ -6,6 +6,7 @@ module Gitlab
       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'
+      WORK_ITEM_LABELS_CHANGED = 'users_updating_work_item_labels'
 
       class << self
         def track_work_item_created_action(author:)
@@ -20,6 +21,10 @@ module Gitlab
           track_unique_action(WORK_ITEM_DATE_CHANGED, author)
         end
 
+        def track_work_item_labels_changed_action(author:)
+          track_unique_action(WORK_ITEM_LABELS_CHANGED, author)
+        end
+
         private
 
         def track_unique_action(action, author)