Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

14 files changed, 238 insertions, 235 deletions

diff --git a/lib/gitlab/usage_data_counters/counter_events/package_events.yml b/lib/gitlab/usage_data_counters/counter_events/package_events.yml
index e1648245f3f..dd66a40a48f 100644
--- a/lib/gitlab/usage_data_counters/counter_events/package_events.yml
+++ b/lib/gitlab/usage_data_counters/counter_events/package_events.yml
@@ -47,3 +47,6 @@
 - i_package_tag_delete_package
 - i_package_tag_pull_package
 - i_package_tag_push_package
+- i_package_terraform_module_delete_package
+- i_package_terraform_module_pull_package
+- i_package_terraform_module_push_package
diff --git a/lib/gitlab/usage_data_counters/editor_unique_counter.rb b/lib/gitlab/usage_data_counters/editor_unique_counter.rb
index bef3fc7b504..bc0126cd893 100644
--- a/lib/gitlab/usage_data_counters/editor_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/editor_unique_counter.rb
@@ -50,7 +50,6 @@ module Gitlab
         private
 
         def track_unique_action(action, author, time)
-          return unless Feature.enabled?(:track_editor_edit_actions, default_enabled: true)
           return unless author
 
           Gitlab::UsageDataCounters::HLLRedisCounter.track_event(action, values: author.id, time: time)
diff --git a/lib/gitlab/usage_data_counters/hll_redis_counter.rb b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
index a8691169fb8..833eebd5d04 100644
--- a/lib/gitlab/usage_data_counters/hll_redis_counter.rb
+++ b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
@@ -132,7 +132,7 @@ module Gitlab
           return unless feature_enabled?(event)
 
           Gitlab::Redis::HLL.add(key: redis_key(event, time, context), value: values, expiry: expiry(event))
-        rescue => e
+        rescue StandardError => e
           # Ignore any exceptions unless is dev or test env
           # The application flow should not be blocked by erros in tracking
           Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e)
@@ -232,8 +232,8 @@ module Gitlab
 
         # Compose the key in order to store events daily or weekly
         def redis_key(event, time, context = '')
-          raise UnknownEvent.new("Unknown event #{event[:name]}") unless known_events_names.include?(event[:name].to_s)
-          raise UnknownAggregation.new("Use :daily or :weekly aggregation") unless ALLOWED_AGGREGATIONS.include?(event[:aggregation].to_sym)
+          raise UnknownEvent, "Unknown event #{event[:name]}" unless known_events_names.include?(event[:name].to_s)
+          raise UnknownAggregation, "Use :daily or :weekly aggregation" unless ALLOWED_AGGREGATIONS.include?(event[:aggregation].to_sym)
 
           key = apply_slot(event)
           key = apply_time_aggregation(key, time, event)
@@ -277,4 +277,4 @@ module Gitlab
   end
 end
 
-Gitlab::UsageDataCounters::HLLRedisCounter.prepend_if_ee('EE::Gitlab::UsageDataCounters::HLLRedisCounter')
+Gitlab::UsageDataCounters::HLLRedisCounter.prepend_mod_with('Gitlab::UsageDataCounters::HLLRedisCounter')
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 6f5f878501f..083de402175 100644
--- a/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb
@@ -154,4 +154,4 @@ module Gitlab
   end
 end
 
-Gitlab::UsageDataCounters::IssueActivityUniqueCounter.prepend_if_ee('EE::Gitlab::UsageDataCounters::IssueActivityUniqueCounter')
+Gitlab::UsageDataCounters::IssueActivityUniqueCounter.prepend_mod_with('Gitlab::UsageDataCounters::IssueActivityUniqueCounter')
diff --git a/lib/gitlab/usage_data_counters/known_events/analytics.yml b/lib/gitlab/usage_data_counters/known_events/analytics.yml
new file mode 100644
index 00000000000..e4f20b61901
--- /dev/null
+++ b/lib/gitlab/usage_data_counters/known_events/analytics.yml
@@ -0,0 +1,85 @@
+- name: users_viewing_analytics_group_devops_adoption
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: i_analytics_dev_ops_adoption
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: i_analytics_dev_ops_score
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: p_analytics_merge_request
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: i_analytics_instance_statistics
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: g_analytics_contribution
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: g_analytics_insights
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: g_analytics_issues
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: g_analytics_productivity
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: g_analytics_valuestream
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: p_analytics_pipelines
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: p_analytics_code_reviews
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: p_analytics_valuestream
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: p_analytics_insights
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: p_analytics_issues
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: p_analytics_repo
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: i_analytics_cohorts
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
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 18c5dc73de2..cc89fbd5caf 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,204 +3,219 @@
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_mr_diffs
 - name: i_code_review_user_single_file_diffs
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_single_file_diffs
 - name: i_code_review_mr_single_file_diffs
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_mr_single_file_diffs
 - name: i_code_review_user_toggled_task_item_status
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_toggled_task_item_status
 - name: i_code_review_user_create_mr
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_create_mr
 - name: i_code_review_user_close_mr
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_close_mr
 - name: i_code_review_user_reopen_mr
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_reopen_mr
 - name: i_code_review_user_approve_mr
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_approve_mr
 - name: i_code_review_user_unapprove_mr
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_unapprove_mr
 - name: i_code_review_user_resolve_thread
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_resolve_thread
 - name: i_code_review_user_unresolve_thread
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_unresolve_thread
 - name: i_code_review_edit_mr_title
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_edit_mr_title
 - name: i_code_review_edit_mr_desc
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_edit_mr_desc
 - name: i_code_review_user_merge_mr
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_merge_mr
 - name: i_code_review_user_create_mr_comment
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_create_mr_comment
 - name: i_code_review_user_edit_mr_comment
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_edit_mr_comment
 - name: i_code_review_user_remove_mr_comment
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_remove_mr_comment
 - name: i_code_review_user_create_review_note
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_create_review_note
 - name: i_code_review_user_publish_review
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_publish_review
 - name: i_code_review_user_create_multiline_mr_comment
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_create_multiline_mr_comment
 - name: i_code_review_user_edit_multiline_mr_comment
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_edit_multiline_mr_comment
 - name: i_code_review_user_remove_multiline_mr_comment
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_remove_multiline_mr_comment
 - name: i_code_review_user_add_suggestion
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_add_suggestion
 - name: i_code_review_user_apply_suggestion
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_apply_suggestion
 - name: i_code_review_user_assigned
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_assigned
 - name: i_code_review_user_marked_as_draft
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_marked_as_draft
 - name: i_code_review_user_unmarked_as_draft
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_unmarked_as_draft
 - name: i_code_review_user_review_requested
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_review_requested
 - name: i_code_review_user_approval_rule_added
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_approval_rule_added
 - name: i_code_review_user_approval_rule_deleted
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_approval_rule_deleted
 - name: i_code_review_user_approval_rule_edited
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_approval_rule_edited
 - name: i_code_review_user_vs_code_api_request
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_vs_code_api_request
 - name: i_code_review_user_create_mr_from_issue
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_create_mr_from_issue
 - name: i_code_review_user_mr_discussion_locked
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_mr_discussion_locked
 - name: i_code_review_user_mr_discussion_unlocked
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_mr_discussion_unlocked
 - name: i_code_review_user_time_estimate_changed
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_time_estimate_changed
 - name: i_code_review_user_time_spent_changed
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_time_spent_changed
 - name: i_code_review_user_assignees_changed
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_assignees_changed
 - name: i_code_review_user_reviewers_changed
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_reviewers_changed
 - name: i_code_review_user_milestone_changed
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_milestone_changed
 - name: i_code_review_user_labels_changed
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_labels_changed
+# Diff settings events
+- name: i_code_review_click_single_file_mode_setting
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_click_file_browser_setting
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_click_whitespace_setting
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_diff_view_inline
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_diff_view_parallel
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_file_browser_tree_view
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_file_browser_list_view
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_diff_show_whitespace
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_diff_hide_whitespace
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_diff_single_file
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_diff_multiple_files
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
diff --git a/lib/gitlab/usage_data_counters/known_events/common.yml b/lib/gitlab/usage_data_counters/known_events/common.yml
index 077864032e8..f2504396cc4 100644
--- a/lib/gitlab/usage_data_counters/known_events/common.yml
+++ b/lib/gitlab/usage_data_counters/known_events/common.yml
@@ -24,92 +24,6 @@
   category: compliance
   redis_slot: compliance
   aggregation: weekly
-  feature_flag: usage_data_a_compliance_audit_events_api
-# Analytics category
-- name: g_analytics_contribution
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: g_analytics_insights
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: g_analytics_issues
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: g_analytics_productivity
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: g_analytics_valuestream
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: p_analytics_pipelines
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: p_analytics_code_reviews
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: p_analytics_valuestream
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: p_analytics_insights
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: p_analytics_issues
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: p_analytics_repo
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: i_analytics_cohorts
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: i_analytics_dev_ops_score
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: i_analytics_dev_ops_adoption
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: g_analytics_merge_request
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: p_analytics_merge_request
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: i_analytics_instance_statistics
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
   feature_flag: track_unique_visits
 - name: g_edit_by_web_ide
   category: ide_edit
@@ -139,17 +53,14 @@
   category: search
   redis_slot: search
   aggregation: weekly
-  feature_flag: search_track_unique_users
 - name: i_search_advanced
   category: search
   redis_slot: search
   aggregation: weekly
-  feature_flag: search_track_unique_users
 - name: i_search_paid
   category: search
   redis_slot: search
   aggregation: weekly
-  feature_flag: search_track_unique_users
 - name: wiki_action
   category: source_code
   aggregation: daily
@@ -175,52 +86,42 @@
   redis_slot: incident_management
   category: incident_management
   aggregation: weekly
-  feature_flag: usage_data_incident_management_alert_status_changed
 - name: incident_management_alert_assigned
   redis_slot: incident_management
   category: incident_management
   aggregation: weekly
-  feature_flag: usage_data_incident_management_alert_assigned
 - name: incident_management_alert_todo
   redis_slot: incident_management
   category: incident_management
   aggregation: weekly
-  feature_flag: usage_data_incident_management_alert_todo
 - name: incident_management_incident_created
   redis_slot: incident_management
   category: incident_management
   aggregation: weekly
-  feature_flag: usage_data_incident_management_incident_created
 - name: incident_management_incident_reopened
   redis_slot: incident_management
   category: incident_management
   aggregation: weekly
-  feature_flag: usage_data_incident_management_incident_reopened
 - name: incident_management_incident_closed
   redis_slot: incident_management
   category: incident_management
   aggregation: weekly
-  feature_flag: usage_data_incident_management_incident_closed
 - name: incident_management_incident_assigned
   redis_slot: incident_management
   category: incident_management
   aggregation: weekly
-  feature_flag: usage_data_incident_management_incident_assigned
 - name: incident_management_incident_todo
   redis_slot: incident_management
   category: incident_management
   aggregation: weekly
-  feature_flag: usage_data_incident_management_incident_todo
 - name: incident_management_incident_comment
   redis_slot: incident_management
   category: incident_management
   aggregation: weekly
-  feature_flag: usage_data_incident_management_incident_comment
 - name: incident_management_incident_zoom_meeting
   redis_slot: incident_management
   category: incident_management
   aggregation: weekly
-  feature_flag: usage_data_incident_management_incident_zoom_meeting
 - name: incident_management_incident_published
   redis_slot: incident_management
   category: incident_management
@@ -230,23 +131,19 @@
   redis_slot: incident_management
   category: incident_management
   aggregation: weekly
-  feature_flag: usage_data_incident_management_incident_relate
 - name: incident_management_incident_unrelate
   redis_slot: incident_management
   category: incident_management
   aggregation: weekly
-  feature_flag: usage_data_incident_management_incident_unrelate
 - name: incident_management_incident_change_confidential
   redis_slot: incident_management
   category: incident_management
   aggregation: weekly
-  feature_flag: usage_data_incident_management_incident_change_confidential
 # Incident management alerts
 - name: incident_management_alert_create_incident
   redis_slot: incident_management
   category: incident_management_alerts
   aggregation: weekly
-  feature_flag: usage_data_incident_management_alert_create_incident
 # Incident management on-call
 - name: i_incident_management_oncall_notification_sent
   redis_slot: incident_management
diff --git a/lib/gitlab/usage_data_counters/known_events/ecosystem.yml b/lib/gitlab/usage_data_counters/known_events/ecosystem.yml
index 1c765bb1830..adc5ba36ad7 100644
--- a/lib/gitlab/usage_data_counters/known_events/ecosystem.yml
+++ b/lib/gitlab/usage_data_counters/known_events/ecosystem.yml
@@ -24,45 +24,35 @@
   category: ecosystem
   redis_slot: ecosystem
   aggregation: weekly
-  feature_flag: usage_data_track_ecosystem_slack_service
 - name: i_ecosystem_slack_service_push_notification
   category: ecosystem
   redis_slot: ecosystem
   aggregation: weekly
-  feature_flag: usage_data_track_ecosystem_slack_service
 - name: i_ecosystem_slack_service_deployment_notification
   category: ecosystem
   redis_slot: ecosystem
   aggregation: weekly
-  feature_flag: usage_data_track_ecosystem_slack_service
 - name: i_ecosystem_slack_service_wiki_page_notification
   category: ecosystem
   redis_slot: ecosystem
   aggregation: weekly
-  feature_flag: usage_data_track_ecosystem_slack_service
 - name: i_ecosystem_slack_service_merge_request_notification
   category: ecosystem
   redis_slot: ecosystem
   aggregation: weekly
-  feature_flag: usage_data_track_ecosystem_slack_service
 - name: i_ecosystem_slack_service_note_notification
   category: ecosystem
   redis_slot: ecosystem
   aggregation: weekly
-  feature_flag: usage_data_track_ecosystem_slack_service
 - name: i_ecosystem_slack_service_tag_push_notification
   category: ecosystem
   redis_slot: ecosystem
   aggregation: weekly
-  feature_flag: usage_data_track_ecosystem_slack_service
 - name: i_ecosystem_slack_service_confidential_note_notification
   category: ecosystem
   redis_slot: ecosystem
   aggregation: weekly
-  feature_flag: usage_data_track_ecosystem_slack_service
 - name: i_ecosystem_slack_service_confidential_issue_notification
   category: ecosystem
   redis_slot: ecosystem
   aggregation: weekly
-  feature_flag: usage_data_track_ecosystem_slack_service
-
diff --git a/lib/gitlab/usage_data_counters/known_events/epic_board_events.yml b/lib/gitlab/usage_data_counters/known_events/epic_board_events.yml
new file mode 100644
index 00000000000..281db441829
--- /dev/null
+++ b/lib/gitlab/usage_data_counters/known_events/epic_board_events.yml
@@ -0,0 +1,22 @@
+# Epic board 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_users_creating_epic_boards
+  category: epic_boards_usage
+  redis_slot: project_management
+  aggregation: daily
+  feature_flag: track_epic_boards_activity
+
+- name: g_project_management_users_viewing_epic_boards
+  category: epic_boards_usage
+  redis_slot: project_management
+  aggregation: daily
+  feature_flag: track_epic_boards_activity
+
+- name: g_project_management_users_updating_epic_board_names
+  category: epic_boards_usage
+  redis_slot: project_management
+  aggregation: daily
+  feature_flag: track_epic_boards_activity
diff --git a/lib/gitlab/usage_data_counters/known_events/epic_events.yml b/lib/gitlab/usage_data_counters/known_events/epic_events.yml
index 80460dbe4d2..d1864cd569b 100644
--- a/lib/gitlab/usage_data_counters/known_events/epic_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/epic_events.yml
@@ -9,6 +9,20 @@
   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
@@ -41,6 +55,20 @@
   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
@@ -81,6 +109,8 @@
   aggregation: daily
   feature_flag: track_epics_activity
 
+# relationships
+
 - name: g_project_management_epic_issue_added
   category: epics_usage
   redis_slot: project_management
@@ -99,6 +129,12 @@
   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
@@ -140,3 +176,9 @@
   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
diff --git a/lib/gitlab/usage_data_counters/known_events/package_events.yml b/lib/gitlab/usage_data_counters/known_events/package_events.yml
index b7e583003c8..d8ad2b538d6 100644
--- a/lib/gitlab/usage_data_counters/known_events/package_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/package_events.yml
@@ -95,3 +95,11 @@
   category: user_packages
   aggregation: weekly
   redis_slot: package
+- name: i_package_terraform_module_deploy_token
+  category: deploy_token_packages
+  aggregation: weekly
+  redis_slot: package
+- name: i_package_terraform_module_user
+  category: user_packages
+  aggregation: weekly
+  redis_slot: package
diff --git a/lib/gitlab/usage_data_counters/known_events/quickactions.yml b/lib/gitlab/usage_data_counters/known_events/quickactions.yml
index 0fe65afb237..c1eabb352f7 100644
--- a/lib/gitlab/usage_data_counters/known_events/quickactions.yml
+++ b/lib/gitlab/usage_data_counters/known_events/quickactions.yml
@@ -3,334 +3,267 @@
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_assign_single
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_assign_multiple
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_assign_self
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_assign_reviewer
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_award
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_board_move
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_child_epic
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_clear_weight
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_clone
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_close
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_confidential
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_copy_metadata_merge_request
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_copy_metadata_issue
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_create_merge_request
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_done
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_draft
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_due
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_duplicate
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_epic
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_estimate
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_iteration
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_label
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_lock
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_merge
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_milestone
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_move
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_parent_epic
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_promote
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_publish
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_reassign
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_reassign_reviewer
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_rebase
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_relabel
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_relate
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_child_epic
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_due_date
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_epic
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_estimate
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_iteration
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_milestone
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_parent_epic
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_time_spent
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_remove_zoom
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_reopen
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_shrug
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_spend_subtract
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_spend_add
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_submit_review
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_subscribe
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_tableflip
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_tag
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_target_branch
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_title
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_todo
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_unassign_specific
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_unassign_all
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_unassign_reviewer
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_unlabel_specific
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_unlabel_all
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_unlock
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_unsubscribe
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_weight
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_wip
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_zoom
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_invite_email_single
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
 - name: i_quickactions_invite_email_multiple
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-  feature_flag: usage_data_track_quickactions
diff --git a/lib/gitlab/usage_data_counters/kubernetes_agent_counter.rb b/lib/gitlab/usage_data_counters/kubernetes_agent_counter.rb
index eae42bdc4a1..8b9ca0fc220 100644
--- a/lib/gitlab/usage_data_counters/kubernetes_agent_counter.rb
+++ b/lib/gitlab/usage_data_counters/kubernetes_agent_counter.rb
@@ -4,17 +4,27 @@ module Gitlab
   module UsageDataCounters
     class KubernetesAgentCounter < BaseCounter
       PREFIX = 'kubernetes_agent'
-      KNOWN_EVENTS = %w[gitops_sync].freeze
+      KNOWN_EVENTS = %w[gitops_sync k8s_api_proxy_request].freeze
 
       class << self
-        def increment_gitops_sync(incr)
-          raise ArgumentError, 'must be greater than or equal to zero' if incr < 0
+        def increment_event_counts(events)
+          validate!(events)
 
-          # rather then hitting redis for this no-op, we return early
-          # note: redis returns the increment, so we mimic this here
-          return 0 if incr == 0
+          events.each do |event, incr|
+            # rather then hitting redis for this no-op, we return early
+            next if incr == 0
 
-          increment_by(redis_key(:gitops_sync), incr)
+            increment_by(redis_key(event), incr)
+          end
+        end
+
+        private
+
+        def validate!(events)
+          events.each do |event, incr|
+            raise ArgumentError, "unknown event #{event}" unless event.in?(KNOWN_EVENTS)
+            raise ArgumentError, "#{event} count must be greater than or equal to zero" if incr < 0
+          end
         end
       end
     end
diff --git a/lib/gitlab/usage_data_counters/quick_action_activity_unique_counter.rb b/lib/gitlab/usage_data_counters/quick_action_activity_unique_counter.rb
index ed3df7dcf75..557179ad57a 100644
--- a/lib/gitlab/usage_data_counters/quick_action_activity_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/quick_action_activity_unique_counter.rb
@@ -7,7 +7,6 @@ module Gitlab
         # Tracks the quick action with name `name`.
         # `args` is expected to be a single string, will be split internally when necessary.
         def track_unique_action(name, args:, user:)
-          return unless Feature.enabled?(:usage_data_track_quickactions, default_enabled: :yaml)
           return unless user
 
           args ||= ''