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

173 files changed, 1667 insertions, 563 deletions

diff --git a/config/metrics/aggregates/code_review.yml b/config/metrics/aggregates/code_review.yml
deleted file mode 100644
index e58707b20a5..00000000000
--- a/config/metrics/aggregates/code_review.yml
+++ /dev/null
@@ -1,246 +0,0 @@
-# NOTE: Please read the following to check if and which aggregate the metric should be added to.
-#
-# code_review_extension_category_monthly_active_users
-# This is only metrics related to the VS Code Extension for now.
-#
-# code_review_category_monthly_active_users
-# This is the user based metrics. These should only be user based metrics and only be related to the Code Review things inside of GitLab.
-#
-# code_review_group_monthly_active_users
-# This is an aggregation of both of the above aggregations. It's intended to represent all users who interact with our group across all of our categories.
----
-- name: code_review_group_monthly_active_users
-  operator: OR
-  source: redis
-  time_frame: [7d, 28d]
-  events:
-    - 'i_code_review_user_single_file_diffs'
-    - 'i_code_review_user_create_mr'
-    - 'i_code_review_user_close_mr'
-    - 'i_code_review_user_reopen_mr'
-    - 'i_code_review_user_resolve_thread'
-    - 'i_code_review_user_unresolve_thread'
-    - 'i_code_review_edit_mr_title'
-    - 'i_code_review_edit_mr_desc'
-    - 'i_code_review_user_merge_mr'
-    - 'i_code_review_user_create_mr_comment'
-    - 'i_code_review_user_edit_mr_comment'
-    - 'i_code_review_user_remove_mr_comment'
-    - 'i_code_review_user_create_review_note'
-    - 'i_code_review_user_publish_review'
-    - 'i_code_review_user_create_multiline_mr_comment'
-    - 'i_code_review_user_edit_multiline_mr_comment'
-    - 'i_code_review_user_remove_multiline_mr_comment'
-    - 'i_code_review_user_add_suggestion'
-    - 'i_code_review_user_apply_suggestion'
-    - 'i_code_review_user_assigned'
-    - 'i_code_review_user_review_requested'
-    - 'i_code_review_user_approve_mr'
-    - 'i_code_review_user_unapprove_mr'
-    - 'i_code_review_user_marked_as_draft'
-    - 'i_code_review_user_unmarked_as_draft'
-    - 'i_code_review_user_approval_rule_added'
-    - 'i_code_review_user_approval_rule_deleted'
-    - 'i_code_review_user_approval_rule_edited'
-    - 'i_code_review_user_vs_code_api_request'
-    - 'i_code_review_user_toggled_task_item_status'
-    - 'i_code_review_user_create_mr_from_issue'
-    - 'i_code_review_user_mr_discussion_locked'
-    - 'i_code_review_user_mr_discussion_unlocked'
-    - 'i_code_review_user_time_estimate_changed'
-    - 'i_code_review_user_time_spent_changed'
-    - 'i_code_review_user_assignees_changed'
-    - 'i_code_review_user_reviewers_changed'
-    - 'i_code_review_user_milestone_changed'
-    - 'i_code_review_user_labels_changed'
-    - 'i_code_review_click_diff_view_setting'
-    - 'i_code_review_click_single_file_mode_setting'
-    - 'i_code_review_click_file_browser_setting'
-    - 'i_code_review_click_whitespace_setting'
-    - 'i_code_review_diff_view_inline'
-    - 'i_code_review_diff_view_parallel'
-    - 'i_code_review_file_browser_tree_view'
-    - 'i_code_review_file_browser_list_view'
-    - 'i_code_review_diff_show_whitespace'
-    - 'i_code_review_diff_hide_whitespace'
-    - 'i_code_review_diff_single_file'
-    - 'i_code_review_diff_multiple_files'
-    - 'i_code_review_user_load_conflict_ui'
-    - 'i_code_review_user_resolve_conflict'
-    - 'i_code_review_user_searches_diff'
-    - 'i_code_review_user_resolve_thread_in_issue'
-    - 'i_code_review_widget_nothing_merge_click_new_file'
-    - 'i_code_review_post_merge_delete_branch'
-    - 'i_code_review_post_merge_click_revert'
-    - 'i_code_review_post_merge_click_cherry_pick'
-    - 'i_code_review_post_merge_submit_revert_modal'
-    - 'i_code_review_post_merge_submit_cherry_pick_modal'
-    - 'i_code_review_user_jetbrains_api_request'
-    - 'i_code_review_user_gitlab_cli_api_request'
-    - 'i_code_review_user_create_note_in_ipynb_diff'
-    - 'i_code_review_user_create_note_in_ipynb_diff_mr'
-    - 'i_code_review_user_create_note_in_ipynb_diff_commit'
-    - 'i_code_review_merge_request_widget_test_summary_view'
-    - 'i_code_review_merge_request_widget_test_summary_full_report_clicked'
-    - 'i_code_review_merge_request_widget_test_summary_expand'
-    - 'i_code_review_merge_request_widget_test_summary_expand_success'
-    - 'i_code_review_merge_request_widget_test_summary_expand_warning'
-    - 'i_code_review_merge_request_widget_test_summary_expand_failed'
-    - 'i_code_review_merge_request_widget_accessibility_view'
-    - 'i_code_review_merge_request_widget_accessibility_full_report_clicked'
-    - 'i_code_review_merge_request_widget_accessibility_expand'
-    - 'i_code_review_merge_request_widget_accessibility_expand_success'
-    - 'i_code_review_merge_request_widget_accessibility_expand_warning'
-    - 'i_code_review_merge_request_widget_accessibility_expand_failed'
-    - 'i_code_review_merge_request_widget_code_quality_view'
-    - 'i_code_review_merge_request_widget_code_quality_full_report_clicked'
-    - 'i_code_review_merge_request_widget_code_quality_expand'
-    - 'i_code_review_merge_request_widget_code_quality_expand_success'
-    - 'i_code_review_merge_request_widget_code_quality_expand_warning'
-    - 'i_code_review_merge_request_widget_code_quality_expand_failed'
-    - 'i_code_review_merge_request_widget_terraform_view'
-    - 'i_code_review_merge_request_widget_terraform_full_report_clicked'
-    - 'i_code_review_merge_request_widget_terraform_expand'
-    - 'i_code_review_merge_request_widget_terraform_expand_success'
-    - 'i_code_review_merge_request_widget_terraform_expand_warning'
-    - 'i_code_review_merge_request_widget_terraform_expand_failed'
-    - 'i_code_review_merge_request_widget_metrics_view'
-    - 'i_code_review_merge_request_widget_metrics_full_report_clicked'
-    - 'i_code_review_merge_request_widget_metrics_expand'
-    - 'i_code_review_merge_request_widget_metrics_expand_success'
-    - 'i_code_review_merge_request_widget_metrics_expand_warning'
-    - 'i_code_review_merge_request_widget_metrics_expand_failed'
-    - 'i_code_review_merge_request_widget_status_checks_view'
-    - 'i_code_review_merge_request_widget_status_checks_full_report_clicked'
-    - 'i_code_review_merge_request_widget_status_checks_expand'
-    - 'i_code_review_merge_request_widget_status_checks_expand_success'
-    - 'i_code_review_merge_request_widget_status_checks_expand_warning'
-    - 'i_code_review_merge_request_widget_status_checks_expand_failed'
-    - 'i_code_review_submit_review_approve'
-    - 'i_code_review_submit_review_comment'
-    - 'i_code_review_merge_request_widget_license_compliance_view'
-    - 'i_code_review_merge_request_widget_license_compliance_full_report_clicked'
-    - 'i_code_review_merge_request_widget_license_compliance_expand'
-    - 'i_code_review_merge_request_widget_license_compliance_expand_success'
-    - 'i_code_review_merge_request_widget_license_compliance_expand_warning'
-    - 'i_code_review_merge_request_widget_license_compliance_expand_failed'
-- name: code_review_category_monthly_active_users
-  operator: OR
-  source: redis
-  time_frame: [7d, 28d]
-  events:
-    - 'i_code_review_user_single_file_diffs'
-    - 'i_code_review_user_create_mr'
-    - 'i_code_review_user_close_mr'
-    - 'i_code_review_user_reopen_mr'
-    - 'i_code_review_user_resolve_thread'
-    - 'i_code_review_user_unresolve_thread'
-    - 'i_code_review_edit_mr_title'
-    - 'i_code_review_edit_mr_desc'
-    - 'i_code_review_user_merge_mr'
-    - 'i_code_review_user_create_mr_comment'
-    - 'i_code_review_user_edit_mr_comment'
-    - 'i_code_review_user_remove_mr_comment'
-    - 'i_code_review_user_create_review_note'
-    - 'i_code_review_user_publish_review'
-    - 'i_code_review_user_create_multiline_mr_comment'
-    - 'i_code_review_user_edit_multiline_mr_comment'
-    - 'i_code_review_user_remove_multiline_mr_comment'
-    - 'i_code_review_user_add_suggestion'
-    - 'i_code_review_user_apply_suggestion'
-    - 'i_code_review_user_assigned'
-    - 'i_code_review_user_review_requested'
-    - 'i_code_review_user_approve_mr'
-    - 'i_code_review_user_unapprove_mr'
-    - 'i_code_review_user_marked_as_draft'
-    - 'i_code_review_user_unmarked_as_draft'
-    - 'i_code_review_user_approval_rule_added'
-    - 'i_code_review_user_approval_rule_deleted'
-    - 'i_code_review_user_approval_rule_edited'
-    - 'i_code_review_user_toggled_task_item_status'
-    - 'i_code_review_user_create_mr_from_issue'
-    - 'i_code_review_user_mr_discussion_locked'
-    - 'i_code_review_user_mr_discussion_unlocked'
-    - 'i_code_review_user_time_estimate_changed'
-    - 'i_code_review_user_time_spent_changed'
-    - 'i_code_review_user_assignees_changed'
-    - 'i_code_review_user_reviewers_changed'
-    - 'i_code_review_user_milestone_changed'
-    - 'i_code_review_user_labels_changed'
-    - 'i_code_review_click_diff_view_setting'
-    - 'i_code_review_click_single_file_mode_setting'
-    - 'i_code_review_click_file_browser_setting'
-    - 'i_code_review_click_whitespace_setting'
-    - 'i_code_review_diff_view_inline'
-    - 'i_code_review_diff_view_parallel'
-    - 'i_code_review_file_browser_tree_view'
-    - 'i_code_review_file_browser_list_view'
-    - 'i_code_review_diff_show_whitespace'
-    - 'i_code_review_diff_hide_whitespace'
-    - 'i_code_review_diff_single_file'
-    - 'i_code_review_diff_multiple_files'
-    - 'i_code_review_user_load_conflict_ui'
-    - 'i_code_review_user_resolve_conflict'
-    - 'i_code_review_user_searches_diff'
-    - 'i_code_review_user_resolve_thread_in_issue'
-    - 'i_code_review_widget_nothing_merge_click_new_file'
-    - 'i_code_review_post_merge_delete_branch'
-    - 'i_code_review_post_merge_click_revert'
-    - 'i_code_review_post_merge_click_cherry_pick'
-    - 'i_code_review_post_merge_submit_revert_modal'
-    - 'i_code_review_post_merge_submit_cherry_pick_modal'
-    - 'i_code_review_user_create_note_in_ipynb_diff'
-    - 'i_code_review_user_create_note_in_ipynb_diff_mr'
-    - 'i_code_review_user_create_note_in_ipynb_diff_commit'
-    - 'i_code_review_merge_request_widget_test_summary_view'
-    - 'i_code_review_merge_request_widget_test_summary_full_report_clicked'
-    - 'i_code_review_merge_request_widget_test_summary_expand'
-    - 'i_code_review_merge_request_widget_test_summary_expand_success'
-    - 'i_code_review_merge_request_widget_test_summary_expand_warning'
-    - 'i_code_review_merge_request_widget_test_summary_expand_failed'
-    - 'i_code_review_merge_request_widget_accessibility_view'
-    - 'i_code_review_merge_request_widget_accessibility_full_report_clicked'
-    - 'i_code_review_merge_request_widget_accessibility_expand'
-    - 'i_code_review_merge_request_widget_accessibility_expand_success'
-    - 'i_code_review_merge_request_widget_accessibility_expand_warning'
-    - 'i_code_review_merge_request_widget_accessibility_expand_failed'
-    - 'i_code_review_merge_request_widget_code_quality_view'
-    - 'i_code_review_merge_request_widget_code_quality_full_report_clicked'
-    - 'i_code_review_merge_request_widget_code_quality_expand'
-    - 'i_code_review_merge_request_widget_code_quality_expand_success'
-    - 'i_code_review_merge_request_widget_code_quality_expand_warning'
-    - 'i_code_review_merge_request_widget_code_quality_expand_failed'
-    - 'i_code_review_merge_request_widget_terraform_view'
-    - 'i_code_review_merge_request_widget_terraform_full_report_clicked'
-    - 'i_code_review_merge_request_widget_terraform_expand'
-    - 'i_code_review_merge_request_widget_terraform_expand_success'
-    - 'i_code_review_merge_request_widget_terraform_expand_warning'
-    - 'i_code_review_merge_request_widget_terraform_expand_failed'
-    - 'i_code_review_merge_request_widget_metrics_view'
-    - 'i_code_review_merge_request_widget_metrics_full_report_clicked'
-    - 'i_code_review_merge_request_widget_metrics_expand'
-    - 'i_code_review_merge_request_widget_metrics_expand_success'
-    - 'i_code_review_merge_request_widget_metrics_expand_warning'
-    - 'i_code_review_merge_request_widget_metrics_expand_failed'
-    - 'i_code_review_merge_request_widget_status_checks_view'
-    - 'i_code_review_merge_request_widget_status_checks_full_report_clicked'
-    - 'i_code_review_merge_request_widget_status_checks_expand'
-    - 'i_code_review_merge_request_widget_status_checks_expand_success'
-    - 'i_code_review_merge_request_widget_status_checks_expand_warning'
-    - 'i_code_review_merge_request_widget_status_checks_expand_failed'
-    - 'i_code_review_submit_review_approve'
-    - 'i_code_review_submit_review_comment'
-    - 'i_code_review_merge_request_widget_license_compliance_view'
-    - 'i_code_review_merge_request_widget_license_compliance_full_report_clicked'
-    - 'i_code_review_merge_request_widget_license_compliance_expand'
-    - 'i_code_review_merge_request_widget_license_compliance_expand_success'
-    - 'i_code_review_merge_request_widget_license_compliance_expand_warning'
-    - 'i_code_review_merge_request_widget_license_compliance_expand_failed'
-- name: code_review_extension_category_monthly_active_users
-  operator: OR
-  source: redis
-  time_frame: [7d, 28d]
-  events:
-    - 'i_code_review_user_vs_code_api_request'
-    - 'i_code_review_user_jetbrains_api_request'
-    - 'i_code_review_user_gitlab_cli_api_request'
diff --git a/config/metrics/aggregates/common.yml b/config/metrics/aggregates/common.yml
deleted file mode 100644
index 35311858c64..00000000000
--- a/config/metrics/aggregates/common.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Aggregated metrics that include EE only event names within `events:` attribute have to be defined at ee/config/metrics/aggregates/common.yml
-# instead of this file.
-# - name: unique name of aggregated metric
-#  operator: aggregation operator. Valid values are:
-#             - "OR": counts unique elements that were observed triggering any of following events
-#             - "AND": counts unique elements that were observed triggering all of following events
-#  events: list of events names to aggregate into metric. All events in this list must have the same 'redis_slot' and 'aggregation' attributes
-#           see from lib/gitlab/usage_data_counters/known_events/ for the list of valid events.
-#  source: defines which datasource will be used to locate events that should be included in aggregated metric. Valid values are:
-#          - database
-#          - redis
-#  time_frame: defines time frames for aggregated metrics:
-#          - 7d - last 7 days
-#          - 28d - last 28 days
-#          - all - all historical available data, this time frame is not available for redis source
-#  feature_flag: name of development feature flag that will be checked before metrics aggregation is performed.
-#                Corresponding feature flag should have `default_enabled` attribute set to `false`.
-#                This attribute is OPTIONAL and can be omitted, when `feature_flag` is missing no feature flag will be checked.
----
-- name: incident_management_alerts_total_unique_counts
-  operator: OR
-  source: redis
-  time_frame: [7d, 28d]
-  events:
-    - 'incident_management_alert_status_changed'
-    - 'incident_management_alert_assigned'
-    - 'incident_management_alert_todo'
-    - 'incident_management_alert_create_incident'
-- name: incident_management_incidents_total_unique_counts
-  operator: OR
-  source: redis
-  time_frame: [7d, 28d]
-  events:
-    - 'incident_management_incident_created'
-    - 'incident_management_incident_reopened'
-    - 'incident_management_incident_closed'
-    - 'incident_management_incident_assigned'
-    - 'incident_management_incident_todo'
-    - 'incident_management_incident_comment'
-    - 'incident_management_incident_zoom_meeting'
-    - 'incident_management_incident_published'
-    - 'incident_management_incident_relate'
-    - 'incident_management_incident_unrelate'
-    - 'incident_management_incident_change_confidential'
-- name: xmau_plan
-  operator: OR
-  source: redis
-  time_frame: [7d, 28d]
-  events:
-    - users_creating_work_items
-    - users_updating_work_item_title
-    - users_updating_work_item_dates
-  feature_flag: track_work_items_activity
-- name: xmau_project_management
-  operator: OR
-  source: redis
-  time_frame: [7d, 28d]
-  events:
-    - users_creating_work_items
-    - users_updating_work_item_title
-    - users_updating_work_item_dates
-  feature_flag: track_work_items_activity
-- name: users_work_items
-  operator: OR
-  source: redis
-  time_frame: [7d, 28d]
-  events:
-    - users_creating_work_items
-    - users_updating_work_item_title
-    - users_updating_work_item_dates
-  feature_flag: track_work_items_activity
diff --git a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
index fbf4be136cb..df64125b058 100644
--- a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - users_viewing_analytics_group_devops_adoption
   - i_analytics_dev_ops_adoption
diff --git a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
index 30de14c43f0..1f8175bd480 100644
--- a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
     - users_viewing_analytics_group_devops_adoption
     - i_analytics_dev_ops_adoption
diff --git a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
index 6aadaed5180..1745055d11e 100644
--- a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - g_edit_by_web_ide
   - g_edit_by_sfe
diff --git a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
index b38129071bf..a62b15af694 100644
--- a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
@@ -13,8 +13,11 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - i_search_total
   - i_search_advanced
diff --git a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
index 1632aed611a..3b61fb65911 100644
--- a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
@@ -9,7 +9,17 @@ product_category: incident_management
 value_type: number
 status: active
 time_frame: 28d
+instrumentation_class: AggregatedMetric
 data_source: redis_hll
+options:
+  aggregate:
+    operator: OR
+    attribute: user_id
+  events:
+    - 'incident_management_alert_status_changed'
+    - 'incident_management_alert_assigned'
+    - 'incident_management_alert_todo'
+    - 'incident_management_alert_create_incident'
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
index 3174894384a..b5afcfa7ae6 100644
--- a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
@@ -9,7 +9,24 @@ product_category: incident_management
 value_type: number
 status: active
 time_frame: 28d
+instrumentation_class: AggregatedMetric
 data_source: redis_hll
+options:
+  aggregate:
+    operator: OR
+    attribute: user_id
+  events:
+    - 'incident_management_incident_created'
+    - 'incident_management_incident_reopened'
+    - 'incident_management_incident_closed'
+    - 'incident_management_incident_assigned'
+    - 'incident_management_incident_todo'
+    - 'incident_management_incident_comment'
+    - 'incident_management_incident_zoom_meeting'
+    - 'incident_management_incident_published'
+    - 'incident_management_incident_relate'
+    - 'incident_management_incident_unrelate'
+    - 'incident_management_incident_change_confidential'
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
index d9aa7d17f43..68335a034a1 100644
--- a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - incident_management_incident_created
   - incident_management_incident_reopened
diff --git a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
index fd67504fee9..bd654f16cd5 100644
--- a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - g_project_management_issue_title_changed
   - g_project_management_issue_description_changed
diff --git a/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml b/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
new file mode 100644
index 00000000000..3c2cad5831e
--- /dev/null
+++ b/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
@@ -0,0 +1,24 @@
+---
+data_category: optional
+key_path: redis_hll_counters.quickactions.i_quickactions_assign_multiple_monthly
+description: Count of MAU using the `/assign @user1 @user2` quick action
+product_section: dev
+product_stage: plan
+product_group: project_management
+product_category: issue_tracking
+value_type: number
+status: active
+time_frame: 28d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - i_quickactions_assign_multiple
+distribution:
+- ce
+- ee
+tier:
+- premium
+- ultimate
+performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181939_releases.yml b/config/metrics/counts_28d/20210216181939_releases.yml
index a2a5a4adb0b..c2530b288b9 100644
--- a/config/metrics/counts_28d/20210216181939_releases.yml
+++ b/config/metrics/counts_28d/20210216181939_releases.yml
@@ -20,4 +20,5 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+- smau
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
index 7901b72ea4b..bd3b35ae0e9 100644
--- a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
@@ -13,8 +13,11 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - i_search_total
   - i_search_advanced
diff --git a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
index 4d8e4409e73..e7eb6a01f82 100644
--- a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - i_code_review_click_diff_view_setting
   - i_code_review_click_file_browser_setting
diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
index 2c6b21b0f6f..554b5c57bb6 100755
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
@@ -46,6 +46,7 @@ options:
   - p_ci_templates_security_secret_detection
   - p_ci_templates_security_license_scanning
   - p_ci_templates_security_coverage_fuzzing
+  - p_ci_templates_security_coverage_fuzzing_latest
   - p_ci_templates_security_api_fuzzing_latest
   - p_ci_templates_security_secure_binaries
   - p_ci_templates_security_dast_api
@@ -56,7 +57,6 @@ options:
   - p_ci_templates_security_dependency_scanning
   - p_ci_templates_security_api_fuzzing
   - p_ci_templates_security_dast
-  - p_ci_templates_security_cluster_image_scanning
   - p_ci_templates_ios_fastlane
   - p_ci_templates_composer
   - p_ci_templates_c
@@ -143,9 +143,7 @@ options:
   - p_ci_templates_implicit_jobs_code_intelligence
   - p_ci_templates_implicit_jobs_code_quality
   - p_ci_templates_implicit_jobs_dependency_scanning
-  - p_ci_templates_implicit_jobs_dependency_scanning_latest
   - p_ci_templates_implicit_jobs_license_scanning
-  - p_ci_templates_implicit_jobs_license_scanning_latest
   - p_ci_templates_implicit_jobs_deploy_ecs
   - p_ci_templates_implicit_jobs_deploy_ec2
   - p_ci_templates_implicit_auto_devops_deploy
@@ -153,27 +151,21 @@ options:
   - p_ci_templates_implicit_jobs_browser_performance_testing
   - p_ci_templates_implicit_jobs_test
   - p_ci_templates_implicit_auto_devops_deploy_latest
-  - p_ci_templates_implicit_jobs_browser_performance_testing_latest
   - p_ci_templates_implicit_jobs_cf_provision
-  - p_ci_templates_implicit_jobs_build_latest
-  - p_ci_templates_implicit_jobs_sast_iac
   - p_ci_templates_implicit_security_sast
   - p_ci_templates_implicit_security_dast_runner_validation
   - p_ci_templates_implicit_security_dast_on_demand_scan
   - p_ci_templates_implicit_security_secret_detection
   - p_ci_templates_implicit_security_license_scanning
   - p_ci_templates_implicit_security_coverage_fuzzing
-  - p_ci_templates_implicit_security_api_fuzzing_latest
   - p_ci_templates_implicit_security_secure_binaries
   - p_ci_templates_implicit_security_dast_api
   - p_ci_templates_implicit_security_dast_api_latest
   - p_ci_templates_implicit_security_container_scanning
-  - p_ci_templates_implicit_security_container_scanning_latest
   - p_ci_templates_implicit_security_dast_latest
   - p_ci_templates_implicit_security_dependency_scanning
   - p_ci_templates_implicit_security_api_fuzzing
   - p_ci_templates_implicit_security_dast
-  - p_ci_templates_implicit_security_cluster_image_scanning
   - p_ci_templates_implicit_security_sast_iac
   - p_ci_templates_kaniko
   - p_ci_templates_qualys_iac_security
diff --git a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
index c5e686a5353..fdd30477ed3 100644
--- a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - i_quickactions_approve
   - i_quickactions_assign_single
@@ -43,6 +46,7 @@ options:
   - i_quickactions_parent_epic
   - i_quickactions_promote
   - i_quickactions_publish
+  - i_quickactions_ready
   - i_quickactions_reassign
   - i_quickactions_reassign_reviewer
   - i_quickactions_rebase
diff --git a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
index 6b6c40495a6..59427c74b0f 100644
--- a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.deploy_token_packages_total_unique_counts_monthly
-description: A monthly count of packages published to the registry using a deploy
+description: A monthly count of unique users who published packages to the registry using a deploy
   token
 product_section: ops
 product_stage: package
@@ -11,8 +11,11 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - i_package_composer_deploy_token
   - i_package_conan_deploy_token
diff --git a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
index e758f06bea9..5223f5c746e 100644
--- a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - i_package_composer_user
   - i_package_conan_user
diff --git a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
index 2d9e5402ffa..9f62f61a967 100644
--- a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - i_ecosystem_jira_service_close_issue
   - i_ecosystem_jira_service_cross_reference
diff --git a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
index f3df451f720..6f7b82ec793 100644
--- a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
@@ -9,13 +9,126 @@ product_category:
 value_type: number
 status: active
 milestone: "13.12"
-time_frame: 28d
-data_source: redis_hll
 distribution:
-- ce
-- ee
+  - ce
+  - ee
 tier:
-- free
-- premium
-- ultimate
+  - free
+  - premium
+  - ultimate
 performance_indicator_type: []
+time_frame: 28d
+instrumentation_class: AggregatedMetric
+data_source: redis_hll
+options:
+  aggregate:
+    operator: OR
+    attribute: user_id
+  events:
+    - 'i_code_review_user_single_file_diffs'
+    - 'i_code_review_user_create_mr'
+    - 'i_code_review_user_close_mr'
+    - 'i_code_review_user_reopen_mr'
+    - 'i_code_review_user_resolve_thread'
+    - 'i_code_review_user_unresolve_thread'
+    - 'i_code_review_edit_mr_title'
+    - 'i_code_review_edit_mr_desc'
+    - 'i_code_review_user_merge_mr'
+    - 'i_code_review_user_create_mr_comment'
+    - 'i_code_review_user_edit_mr_comment'
+    - 'i_code_review_user_remove_mr_comment'
+    - 'i_code_review_user_create_review_note'
+    - 'i_code_review_user_publish_review'
+    - 'i_code_review_user_create_multiline_mr_comment'
+    - 'i_code_review_user_edit_multiline_mr_comment'
+    - 'i_code_review_user_remove_multiline_mr_comment'
+    - 'i_code_review_user_add_suggestion'
+    - 'i_code_review_user_apply_suggestion'
+    - 'i_code_review_user_assigned'
+    - 'i_code_review_user_review_requested'
+    - 'i_code_review_user_approve_mr'
+    - 'i_code_review_user_unapprove_mr'
+    - 'i_code_review_user_marked_as_draft'
+    - 'i_code_review_user_unmarked_as_draft'
+    - 'i_code_review_user_approval_rule_added'
+    - 'i_code_review_user_approval_rule_deleted'
+    - 'i_code_review_user_approval_rule_edited'
+    - 'i_code_review_user_toggled_task_item_status'
+    - 'i_code_review_user_create_mr_from_issue'
+    - 'i_code_review_user_mr_discussion_locked'
+    - 'i_code_review_user_mr_discussion_unlocked'
+    - 'i_code_review_user_time_estimate_changed'
+    - 'i_code_review_user_time_spent_changed'
+    - 'i_code_review_user_assignees_changed'
+    - 'i_code_review_user_reviewers_changed'
+    - 'i_code_review_user_milestone_changed'
+    - 'i_code_review_user_labels_changed'
+    - 'i_code_review_click_diff_view_setting'
+    - 'i_code_review_click_single_file_mode_setting'
+    - 'i_code_review_click_file_browser_setting'
+    - 'i_code_review_click_whitespace_setting'
+    - 'i_code_review_diff_view_inline'
+    - 'i_code_review_diff_view_parallel'
+    - 'i_code_review_file_browser_tree_view'
+    - 'i_code_review_file_browser_list_view'
+    - 'i_code_review_diff_show_whitespace'
+    - 'i_code_review_diff_hide_whitespace'
+    - 'i_code_review_diff_single_file'
+    - 'i_code_review_diff_multiple_files'
+    - 'i_code_review_user_load_conflict_ui'
+    - 'i_code_review_user_resolve_conflict'
+    - 'i_code_review_user_searches_diff'
+    - 'i_code_review_user_resolve_thread_in_issue'
+    - 'i_code_review_widget_nothing_merge_click_new_file'
+    - 'i_code_review_post_merge_delete_branch'
+    - 'i_code_review_post_merge_click_revert'
+    - 'i_code_review_post_merge_click_cherry_pick'
+    - 'i_code_review_post_merge_submit_revert_modal'
+    - 'i_code_review_post_merge_submit_cherry_pick_modal'
+    - 'i_code_review_user_create_note_in_ipynb_diff'
+    - 'i_code_review_user_create_note_in_ipynb_diff_mr'
+    - 'i_code_review_user_create_note_in_ipynb_diff_commit'
+    - 'i_code_review_merge_request_widget_test_summary_view'
+    - 'i_code_review_merge_request_widget_test_summary_full_report_clicked'
+    - 'i_code_review_merge_request_widget_test_summary_expand'
+    - 'i_code_review_merge_request_widget_test_summary_expand_success'
+    - 'i_code_review_merge_request_widget_test_summary_expand_warning'
+    - 'i_code_review_merge_request_widget_test_summary_expand_failed'
+    - 'i_code_review_merge_request_widget_accessibility_view'
+    - 'i_code_review_merge_request_widget_accessibility_full_report_clicked'
+    - 'i_code_review_merge_request_widget_accessibility_expand'
+    - 'i_code_review_merge_request_widget_accessibility_expand_success'
+    - 'i_code_review_merge_request_widget_accessibility_expand_warning'
+    - 'i_code_review_merge_request_widget_accessibility_expand_failed'
+    - 'i_code_review_merge_request_widget_code_quality_view'
+    - 'i_code_review_merge_request_widget_code_quality_full_report_clicked'
+    - 'i_code_review_merge_request_widget_code_quality_expand'
+    - 'i_code_review_merge_request_widget_code_quality_expand_success'
+    - 'i_code_review_merge_request_widget_code_quality_expand_warning'
+    - 'i_code_review_merge_request_widget_code_quality_expand_failed'
+    - 'i_code_review_merge_request_widget_terraform_view'
+    - 'i_code_review_merge_request_widget_terraform_full_report_clicked'
+    - 'i_code_review_merge_request_widget_terraform_expand'
+    - 'i_code_review_merge_request_widget_terraform_expand_success'
+    - 'i_code_review_merge_request_widget_terraform_expand_warning'
+    - 'i_code_review_merge_request_widget_terraform_expand_failed'
+    - 'i_code_review_merge_request_widget_metrics_view'
+    - 'i_code_review_merge_request_widget_metrics_full_report_clicked'
+    - 'i_code_review_merge_request_widget_metrics_expand'
+    - 'i_code_review_merge_request_widget_metrics_expand_success'
+    - 'i_code_review_merge_request_widget_metrics_expand_warning'
+    - 'i_code_review_merge_request_widget_metrics_expand_failed'
+    - 'i_code_review_merge_request_widget_status_checks_view'
+    - 'i_code_review_merge_request_widget_status_checks_full_report_clicked'
+    - 'i_code_review_merge_request_widget_status_checks_expand'
+    - 'i_code_review_merge_request_widget_status_checks_expand_success'
+    - 'i_code_review_merge_request_widget_status_checks_expand_warning'
+    - 'i_code_review_merge_request_widget_status_checks_expand_failed'
+    - 'i_code_review_submit_review_approve'
+    - 'i_code_review_submit_review_comment'
+    - 'i_code_review_merge_request_widget_license_compliance_view'
+    - 'i_code_review_merge_request_widget_license_compliance_full_report_clicked'
+    - 'i_code_review_merge_request_widget_license_compliance_expand'
+    - 'i_code_review_merge_request_widget_license_compliance_expand_success'
+    - 'i_code_review_merge_request_widget_license_compliance_expand_warning'
+    - 'i_code_review_merge_request_widget_license_compliance_expand_failed'
diff --git a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
index 4594539267d..379307a2f44 100644
--- a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
@@ -11,7 +11,16 @@ status: active
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53553
 time_frame: 28d
+instrumentation_class: AggregatedMetric
 data_source: redis_hll
+options:
+  aggregate:
+    operator: OR
+    attribute: user_id
+  events:
+    - 'i_code_review_user_vs_code_api_request'
+    - 'i_code_review_user_jetbrains_api_request'
+    - 'i_code_review_user_gitlab_cli_api_request'
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
index 939e8d69063..ce14aa19f9c 100644
--- a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
@@ -10,8 +10,6 @@ value_type: number
 status: active
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53553
-time_frame: 28d
-data_source: redis_hll
 distribution:
 - ce
 - ee
@@ -20,3 +18,121 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+instrumentation_class: AggregatedMetric
+time_frame: 28d
+data_source: redis_hll
+options:
+  aggregate:
+    operator: OR
+    attribute: user_id
+  events:
+    - 'i_code_review_user_single_file_diffs'
+    - 'i_code_review_user_create_mr'
+    - 'i_code_review_user_close_mr'
+    - 'i_code_review_user_reopen_mr'
+    - 'i_code_review_user_resolve_thread'
+    - 'i_code_review_user_unresolve_thread'
+    - 'i_code_review_edit_mr_title'
+    - 'i_code_review_edit_mr_desc'
+    - 'i_code_review_user_merge_mr'
+    - 'i_code_review_user_create_mr_comment'
+    - 'i_code_review_user_edit_mr_comment'
+    - 'i_code_review_user_remove_mr_comment'
+    - 'i_code_review_user_create_review_note'
+    - 'i_code_review_user_publish_review'
+    - 'i_code_review_user_create_multiline_mr_comment'
+    - 'i_code_review_user_edit_multiline_mr_comment'
+    - 'i_code_review_user_remove_multiline_mr_comment'
+    - 'i_code_review_user_add_suggestion'
+    - 'i_code_review_user_apply_suggestion'
+    - 'i_code_review_user_assigned'
+    - 'i_code_review_user_review_requested'
+    - 'i_code_review_user_approve_mr'
+    - 'i_code_review_user_unapprove_mr'
+    - 'i_code_review_user_marked_as_draft'
+    - 'i_code_review_user_unmarked_as_draft'
+    - 'i_code_review_user_approval_rule_added'
+    - 'i_code_review_user_approval_rule_deleted'
+    - 'i_code_review_user_approval_rule_edited'
+    - 'i_code_review_user_vs_code_api_request'
+    - 'i_code_review_user_toggled_task_item_status'
+    - 'i_code_review_user_create_mr_from_issue'
+    - 'i_code_review_user_mr_discussion_locked'
+    - 'i_code_review_user_mr_discussion_unlocked'
+    - 'i_code_review_user_time_estimate_changed'
+    - 'i_code_review_user_time_spent_changed'
+    - 'i_code_review_user_assignees_changed'
+    - 'i_code_review_user_reviewers_changed'
+    - 'i_code_review_user_milestone_changed'
+    - 'i_code_review_user_labels_changed'
+    - 'i_code_review_click_diff_view_setting'
+    - 'i_code_review_click_single_file_mode_setting'
+    - 'i_code_review_click_file_browser_setting'
+    - 'i_code_review_click_whitespace_setting'
+    - 'i_code_review_diff_view_inline'
+    - 'i_code_review_diff_view_parallel'
+    - 'i_code_review_file_browser_tree_view'
+    - 'i_code_review_file_browser_list_view'
+    - 'i_code_review_diff_show_whitespace'
+    - 'i_code_review_diff_hide_whitespace'
+    - 'i_code_review_diff_single_file'
+    - 'i_code_review_diff_multiple_files'
+    - 'i_code_review_user_load_conflict_ui'
+    - 'i_code_review_user_resolve_conflict'
+    - 'i_code_review_user_searches_diff'
+    - 'i_code_review_user_resolve_thread_in_issue'
+    - 'i_code_review_widget_nothing_merge_click_new_file'
+    - 'i_code_review_post_merge_delete_branch'
+    - 'i_code_review_post_merge_click_revert'
+    - 'i_code_review_post_merge_click_cherry_pick'
+    - 'i_code_review_post_merge_submit_revert_modal'
+    - 'i_code_review_post_merge_submit_cherry_pick_modal'
+    - 'i_code_review_user_jetbrains_api_request'
+    - 'i_code_review_user_gitlab_cli_api_request'
+    - 'i_code_review_user_create_note_in_ipynb_diff'
+    - 'i_code_review_user_create_note_in_ipynb_diff_mr'
+    - 'i_code_review_user_create_note_in_ipynb_diff_commit'
+    - 'i_code_review_merge_request_widget_test_summary_view'
+    - 'i_code_review_merge_request_widget_test_summary_full_report_clicked'
+    - 'i_code_review_merge_request_widget_test_summary_expand'
+    - 'i_code_review_merge_request_widget_test_summary_expand_success'
+    - 'i_code_review_merge_request_widget_test_summary_expand_warning'
+    - 'i_code_review_merge_request_widget_test_summary_expand_failed'
+    - 'i_code_review_merge_request_widget_accessibility_view'
+    - 'i_code_review_merge_request_widget_accessibility_full_report_clicked'
+    - 'i_code_review_merge_request_widget_accessibility_expand'
+    - 'i_code_review_merge_request_widget_accessibility_expand_success'
+    - 'i_code_review_merge_request_widget_accessibility_expand_warning'
+    - 'i_code_review_merge_request_widget_accessibility_expand_failed'
+    - 'i_code_review_merge_request_widget_code_quality_view'
+    - 'i_code_review_merge_request_widget_code_quality_full_report_clicked'
+    - 'i_code_review_merge_request_widget_code_quality_expand'
+    - 'i_code_review_merge_request_widget_code_quality_expand_success'
+    - 'i_code_review_merge_request_widget_code_quality_expand_warning'
+    - 'i_code_review_merge_request_widget_code_quality_expand_failed'
+    - 'i_code_review_merge_request_widget_terraform_view'
+    - 'i_code_review_merge_request_widget_terraform_full_report_clicked'
+    - 'i_code_review_merge_request_widget_terraform_expand'
+    - 'i_code_review_merge_request_widget_terraform_expand_success'
+    - 'i_code_review_merge_request_widget_terraform_expand_warning'
+    - 'i_code_review_merge_request_widget_terraform_expand_failed'
+    - 'i_code_review_merge_request_widget_metrics_view'
+    - 'i_code_review_merge_request_widget_metrics_full_report_clicked'
+    - 'i_code_review_merge_request_widget_metrics_expand'
+    - 'i_code_review_merge_request_widget_metrics_expand_success'
+    - 'i_code_review_merge_request_widget_metrics_expand_warning'
+    - 'i_code_review_merge_request_widget_metrics_expand_failed'
+    - 'i_code_review_merge_request_widget_status_checks_view'
+    - 'i_code_review_merge_request_widget_status_checks_full_report_clicked'
+    - 'i_code_review_merge_request_widget_status_checks_expand'
+    - 'i_code_review_merge_request_widget_status_checks_expand_success'
+    - 'i_code_review_merge_request_widget_status_checks_expand_warning'
+    - 'i_code_review_merge_request_widget_status_checks_expand_failed'
+    - 'i_code_review_submit_review_approve'
+    - 'i_code_review_submit_review_comment'
+    - 'i_code_review_merge_request_widget_license_compliance_view'
+    - 'i_code_review_merge_request_widget_license_compliance_full_report_clicked'
+    - 'i_code_review_merge_request_widget_license_compliance_expand'
+    - 'i_code_review_merge_request_widget_license_compliance_expand_success'
+    - 'i_code_review_merge_request_widget_license_compliance_expand_warning'
+    - 'i_code_review_merge_request_widget_license_compliance_expand_failed'
diff --git a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
index a3f1a052531..698928834ed 100644
--- a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
@@ -12,8 +12,11 @@ milestone: "13.12"
 introduced_by_url:
 time_frame: 28d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
     - o_pipeline_authoring_unique_users_committing_ciconfigfile
     - o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
diff --git a/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml
index c5ce964bfaa..539781592bd 100644
--- a/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 28d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_load_performance_testing
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml b/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml
index 5bd79adf6e5..d5dd0372093 100644
--- a/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 28d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_browser_performance_testing_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml b/config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml
index 362aed75e00..f8f018a6a28 100644
--- a/config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml
+++ b/config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 28d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_cf_provision
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml b/config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml
index d7c78554423..81a1a37e050 100644
--- a/config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 28d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_build_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml b/config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml
index a688785bc0f..49f7d1e9cf1 100644
--- a/config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml
+++ b/config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 28d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_dast_runner_validation
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml b/config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml
index 97bd575f2f3..b3deccc2520 100644
--- a/config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml
+++ b/config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 28d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_dast_on_demand_scan
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml b/config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml
index 8735c299082..ba4ec3b4fa3 100644
--- a/config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 28d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_coverage_fuzzing
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml b/config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml
index 70f42f3861e..176964c3cdc 100644
--- a/config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 28d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_api_fuzzing_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml b/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml
index 35235a85b19..0c8001e6f77 100644
--- a/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml
+++ b/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 28d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_secure_binaries
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml b/config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml
index 087a55fd275..9c22a733f84 100644
--- a/config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml
+++ b/config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 28d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_dast_api
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml b/config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml
index 0adb938298c..de98bdd43b7 100644
--- a/config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 28d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_dast_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml b/config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml
index 85868e0c79c..d0e9b20316b 100644
--- a/config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 28d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_api_fuzzing
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml
index 28ed156f483..73141ddf341 100644
--- a/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml
@@ -6,8 +6,8 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
-milestone: "14.4"
+status: removed
+milestone: '14.4'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71157
 time_frame: 28d
 data_source: redis_hll
@@ -22,4 +22,6 @@ tier:
 - ultimate
 options:
   events:
-    - p_ci_templates_implicit_jobs_deploy_latest
+  - p_ci_templates_implicit_jobs_deploy_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml
index 72a061f831b..781dbbe7b60 100644
--- a/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml
@@ -3,11 +3,11 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_sast_
 description: Count of pipelines with implicit runs using the latest SAST IaC template
 product_section: sec
 product_stage: secure
-product_group: "static_analysis"
+product_group: static_analysis
 product_category: SAST
 value_type: number
-status: active
-milestone: "14.5"
+status: removed
+milestone: '14.5'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73076
 time_frame: 28d
 data_source: redis_hll
@@ -24,3 +24,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_sast_iac_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml
index 2a34553de79..c676750d92d 100644
--- a/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml
@@ -3,11 +3,11 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_sast_iac_
 description: Count of pipelines with implicit runs using the latest SAST IaC template
 product_section: sec
 product_stage: secure
-product_group: "static_analysis"
+product_group: static_analysis
 product_category: SAST
 value_type: number
-status: active
-milestone: "14.5"
+status: removed
+milestone: '14.5'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73074
 time_frame: 28d
 data_source: redis_hll
@@ -24,3 +24,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_sast_iac_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_monthly.yml b/config/metrics/counts_28d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_monthly.yml
index 4b9bf4120f5..ec67d0a713f 100644
--- a/config/metrics/counts_28d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_monthly.yml
@@ -6,7 +6,7 @@ product_stage: secure
 product_group: dynamic_analysis
 product_category: dynamic_application_security_testing
 value_type: number
-status: active
+status: removed
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73876
 time_frame: 28d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_dast_api_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20220222215951_xmau_plan.yml b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
index aaa9558d5a6..c254ad942c2 100644
--- a/config/metrics/counts_28d/20220222215951_xmau_plan.yml
+++ b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
@@ -10,7 +10,18 @@ status: active
 milestone: '14.9'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
 time_frame: 28d
+instrumentation_class: WorkItemsActivityAggregatedMetric
 data_source: redis_hll
+options:
+  aggregate:
+    operator: OR
+    attribute: user_id
+  events:
+    - users_creating_work_items
+    - users_updating_work_item_title
+    - users_updating_work_item_dates
+    - users_updating_work_item_labels
+    - users_updating_work_item_iteration
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
index ede46c85292..0dad4fd0979 100644
--- a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
+++ b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
@@ -10,7 +10,18 @@ status: active
 milestone: '14.9'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
 time_frame: 28d
+instrumentation_class: WorkItemsActivityAggregatedMetric
 data_source: redis_hll
+options:
+  aggregate:
+    operator: OR
+    attribute: user_id
+  events:
+    - users_creating_work_items
+    - users_updating_work_item_title
+    - users_updating_work_item_dates
+    - users_updating_work_item_labels
+    - users_updating_work_item_iteration
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20220222215955_users_work_items.yml b/config/metrics/counts_28d/20220222215955_users_work_items.yml
index a0f892fcef2..ec07fb25f11 100644
--- a/config/metrics/counts_28d/20220222215955_users_work_items.yml
+++ b/config/metrics/counts_28d/20220222215955_users_work_items.yml
@@ -10,7 +10,18 @@ status: active
 milestone: '14.9'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
 time_frame: 28d
+instrumentation_class: WorkItemsActivityAggregatedMetric
 data_source: redis_hll
+options:
+  aggregate:
+    operator: OR
+    attribute: user_id
+  events:
+    - users_creating_work_items
+    - users_updating_work_item_title
+    - users_updating_work_item_dates
+    - users_updating_work_item_labels
+    - users_updating_work_item_iteration
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml b/config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml
index d627a61d553..64f0bc79682 100644
--- a/config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml
@@ -1,14 +1,15 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_secret_detection_latest_monthly
-description: Weekly counts for implicit use of Secret Detection CI Latest template (Jobs folder)
+description: Weekly counts for implicit use of Secret Detection CI Latest template
+  (Jobs folder)
 product_section: sec
 product_stage: secure
 product_group: static_analysis
 product_category: static_application_security_testing
 value_type: number
-status: active
-milestone: "15.0"
-introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81847'
+status: removed
+milestone: '15.0'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81847
 time_frame: 28d
 data_source: redis_hll
 data_category: optional
@@ -23,3 +24,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_secret_detection_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml b/config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml
index a9902f76feb..e77e4044894 100644
--- a/config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml
@@ -6,9 +6,9 @@ product_stage: secure
 product_group: static_analysis
 product_category: static_application_security_testing
 value_type: number
-status: active
-milestone: "15.0"
-introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81847'
+status: removed
+milestone: '15.0'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81847
 time_frame: 28d
 data_source: redis_hll
 data_category: optional
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_sast_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml
index 50a854eb455..646260aa65e 100644
--- a/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml
@@ -12,8 +12,11 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82543
 time_frame: 28d
 data_source: redis_hll
 data_category: optional
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
     - error_tracking_view_list
     - error_tracking_view_details
diff --git a/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml
index cfdd8987275..d379cf39983 100644
--- a/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml
@@ -13,8 +13,11 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90205
 time_frame: 28d
 data_source: redis_hll
 data_category: optional
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
     - incident_management_timeline_event_created
     - incident_management_timeline_event_edited
diff --git a/config/metrics/counts_28d/20220719133315_p_ci_templates_implicit_security_fortify_fod_sast_monthly.yml b/config/metrics/counts_28d/20220719133315_p_ci_templates_implicit_security_fortify_fod_sast_monthly.yml
index 56c9fb62bd3..574c9f41128 100644
--- a/config/metrics/counts_28d/20220719133315_p_ci_templates_implicit_security_fortify_fod_sast_monthly.yml
+++ b/config/metrics/counts_28d/20220719133315_p_ci_templates_implicit_security_fortify_fod_sast_monthly.yml
@@ -6,8 +6,8 @@ product_stage: secure
 product_group: static_analysis
 product_category: SAST
 value_type: number
-status: active
-milestone: "15.3"
+status: removed
+milestone: '15.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91956
 time_frame: 28d
 data_source: redis_hll
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_fortify_fod_sast
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20220906065651_incident_management_timeline_event_created_monthly.yml b/config/metrics/counts_28d/20220906065651_incident_management_timeline_event_created_monthly.yml
new file mode 100644
index 00000000000..86b11489af0
--- /dev/null
+++ b/config/metrics/counts_28d/20220906065651_incident_management_timeline_event_created_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.incident_management.incident_management_timeline_event_created_monthly
+description: Count of unique users created timeline events
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: incident_management
+value_type: number
+status: active
+milestone: "15.5"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97006"
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - incident_management_timeline_event_created
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20220906070355_incident_management_timeline_event_edited_monthly.yml b/config/metrics/counts_28d/20220906070355_incident_management_timeline_event_edited_monthly.yml
new file mode 100644
index 00000000000..31815426918
--- /dev/null
+++ b/config/metrics/counts_28d/20220906070355_incident_management_timeline_event_edited_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.incident_management.incident_management_timeline_event_edited_monthly
+description: Count of unique users edited timeline events
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: incident_management
+value_type: number
+status: active
+milestone: "15.5"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97006"
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - incident_management_timeline_event_edited
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20220906070634_incident_management_timeline_event_deleted_monthly.yml b/config/metrics/counts_28d/20220906070634_incident_management_timeline_event_deleted_monthly.yml
new file mode 100644
index 00000000000..dbc3ac61071
--- /dev/null
+++ b/config/metrics/counts_28d/20220906070634_incident_management_timeline_event_deleted_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.incident_management.incident_management_timeline_event_deleted_monthly
+description: Count of unique users deleted timeline events
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: incident_management
+value_type: number
+status: active
+milestone: "15.5"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97006"
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - incident_management_timeline_event_deleted
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20220907032044_i_quickactions_ready_monthly.yml b/config/metrics/counts_28d/20220907032044_i_quickactions_ready_monthly.yml
new file mode 100644
index 00000000000..943a1ba235c
--- /dev/null
+++ b/config/metrics/counts_28d/20220907032044_i_quickactions_ready_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.project_management.i_quickactions_ready_monthly
+description: Count of MAU using the `/ready` quick action
+product_section: dev
+product_stage: plan
+product_group: project_management
+product_category: issue_tracking
+value_type: number
+data_source: redis_hll
+status: active
+milestone: "15.4"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97115"
+time_frame: 28d
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_ready
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20220907084347_p_ci_templates_implicit_security_sast_iac_monthly.yml b/config/metrics/counts_28d/20220907084347_p_ci_templates_implicit_security_sast_iac_monthly.yml
index 2f32d5a3569..47068af05e2 100644
--- a/config/metrics/counts_28d/20220907084347_p_ci_templates_implicit_security_sast_iac_monthly.yml
+++ b/config/metrics/counts_28d/20220907084347_p_ci_templates_implicit_security_sast_iac_monthly.yml
@@ -1,13 +1,14 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_sast_iac_monthly
-description: Count of pipelines with implicit SAST runs using the stable SAST IaC template
+description: Count of pipelines with implicit SAST runs using the stable SAST IaC
+  template
 product_section: sec
 product_stage: secure
-product_group: "static_analysis"
+product_group: static_analysis
 product_category: SAST
 value_type: number
-status: active
-milestone: "15.4"
+status: removed
+milestone: '15.4'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86275
 time_frame: 28d
 data_source: redis_hll
@@ -24,3 +25,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_sast_iac
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20220907102714_p_ci_templates_implicit_jobs_sast_iac_monthly.yml b/config/metrics/counts_28d/20220907102714_p_ci_templates_implicit_jobs_sast_iac_monthly.yml
index 368c15653e9..0bcdad370ce 100644
--- a/config/metrics/counts_28d/20220907102714_p_ci_templates_implicit_jobs_sast_iac_monthly.yml
+++ b/config/metrics/counts_28d/20220907102714_p_ci_templates_implicit_jobs_sast_iac_monthly.yml
@@ -1,13 +1,14 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_sast_iac_monthly
-description: Count of pipelines with implicit SAST jobs using the stable SAST IaC template
+description: Count of pipelines with implicit SAST jobs using the stable SAST IaC
+  template
 product_section: sec
 product_stage: secure
-product_group: "static_analysis"
+product_group: static_analysis
 product_category: SAST
 value_type: number
-status: active
-milestone: "15.4"
+status: removed
+milestone: '15.4'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86275
 time_frame: 28d
 data_source: redis_hll
@@ -24,3 +25,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_sast_iac
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20220912161240_p_ci_templates_implicit_jobs_dependency_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220912161240_p_ci_templates_implicit_jobs_dependency_scanning_latest_monthly.yml
index a3a435fca09..8e51d7e163a 100644
--- a/config/metrics/counts_28d/20220912161240_p_ci_templates_implicit_jobs_dependency_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220912161240_p_ci_templates_implicit_jobs_dependency_scanning_latest_monthly.yml
@@ -1,14 +1,15 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_dependency_scanning_latest_monthly
-description: Monthly counts for implicit Dependency Scanning CI Latest template (Jobs folder)
+description: Monthly counts for implicit Dependency Scanning CI Latest template (Jobs
+  folder)
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
 product_category: dependency_scanning
 value_type: number
-status: active
-milestone: "15.4"
-introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323'
+status: removed
+milestone: '15.4'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323
 time_frame: 28d
 data_source: redis_hll
 data_category: optional
@@ -23,3 +24,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_dependency_scanning_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20220912162308_p_ci_templates_implicit_jobs_license_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220912162308_p_ci_templates_implicit_jobs_license_scanning_latest_monthly.yml
index acc48ff2a44..8ad48955bea 100644
--- a/config/metrics/counts_28d/20220912162308_p_ci_templates_implicit_jobs_license_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220912162308_p_ci_templates_implicit_jobs_license_scanning_latest_monthly.yml
@@ -1,14 +1,15 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_license_scanning_latest_monthly
-description: Monthly counts for implicit License Scanning CI Latest template (Jobs folder)
+description: Monthly counts for implicit License Scanning CI Latest template (Jobs
+  folder)
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
 product_category: license_scanning
 value_type: number
-status: active
-milestone: "15.4"
-introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323'
+status: removed
+milestone: '15.4'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323
 time_frame: 28d
 data_source: redis_hll
 data_category: optional
@@ -23,3 +24,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_license_scanning_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20220912162752_p_ci_templates_implicit_security_container_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220912162752_p_ci_templates_implicit_security_container_scanning_latest_monthly.yml
index 2aebbc3a9eb..3d5db04c7b8 100644
--- a/config/metrics/counts_28d/20220912162752_p_ci_templates_implicit_security_container_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220912162752_p_ci_templates_implicit_security_container_scanning_latest_monthly.yml
@@ -1,14 +1,15 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_container_scanning_latest_monthly
-description: Monthly counts for implicit Container Scanning CI Latest template (Security folder)
+description: Monthly counts for implicit Container Scanning CI Latest template (Security
+  folder)
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
 product_category: container_scanning
 value_type: number
-status: active
-milestone: "15.4"
-introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323'
+status: removed
+milestone: '15.4'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323
 time_frame: 28d
 data_source: redis_hll
 data_category: optional
@@ -23,3 +24,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_container_scanning_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20220913225020_p_ci_templates_security_coverage_fuzzing_latest_monthly.yml b/config/metrics/counts_28d/20220913225020_p_ci_templates_security_coverage_fuzzing_latest_monthly.yml
new file mode 100644
index 00000000000..c4fad8d7545
--- /dev/null
+++ b/config/metrics/counts_28d/20220913225020_p_ci_templates_security_coverage_fuzzing_latest_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_security_coverage_fuzzing_latest_monthly
+description: Monthly counts for Coverage Fuzzing latest CI template
+product_section: sec
+product_stage: secure
+product_group: dynamic_analysis
+product_category: dynamic_application_security_testing
+value_type: number
+status: active
+milestone: "15.5"
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97886'
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_security_coverage_fuzzing_latest
diff --git a/config/metrics/counts_28d/20220913225303_p_ci_templates_implicit_security_coverage_fuzzing_latest_monthly.yml b/config/metrics/counts_28d/20220913225303_p_ci_templates_implicit_security_coverage_fuzzing_latest_monthly.yml
new file mode 100644
index 00000000000..a66558a3537
--- /dev/null
+++ b/config/metrics/counts_28d/20220913225303_p_ci_templates_implicit_security_coverage_fuzzing_latest_monthly.yml
@@ -0,0 +1,27 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_coverage_fuzzing_latest_monthly
+description: Monthly counts for implicit Coverage Fuzzing latest CI template
+product_section: sec
+product_stage: secure
+product_group: dynamic_analysis
+product_category: dynamic_application_security_testing
+value_type: number
+status: removed
+milestone: '15.5'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97886
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_implicit_security_coverage_fuzzing_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_28d/20220922042106_users_updating_work_item_iteration_monthly.yml b/config/metrics/counts_28d/20220922042106_users_updating_work_item_iteration_monthly.yml
new file mode 100644
index 00000000000..4c19e4e3261
--- /dev/null
+++ b/config/metrics/counts_28d/20220922042106_users_updating_work_item_iteration_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.work_items.users_updating_work_item_iteration_monthly
+description: Unique users updating a work item's iteration
+product_section: team planning
+product_stage: dev
+product_group: plan
+product_category: project_management
+value_type: number
+status: active
+milestone: "15.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98539
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_updating_work_item_iteration
+distribution:
+- ce
+- ee
+tier:
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221006065524_i_quickactions_link_monthly.yml b/config/metrics/counts_28d/20221006065524_i_quickactions_link_monthly.yml
new file mode 100644
index 00000000000..52b75a90a03
--- /dev/null
+++ b/config/metrics/counts_28d/20221006065524_i_quickactions_link_monthly.yml
@@ -0,0 +1,26 @@
+key_path: redis_hll_counters.quickactions.i_quickactions_link_monthly
+name: quickactions_timeline_monthly
+description: Count of MAU using the `/link` quick action
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: incident_management
+value_type: number
+status: active
+milestone: "15.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99963
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_link
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml b/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml
new file mode 100644
index 00000000000..5ebb56ea936
--- /dev/null
+++ b/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.work_items.users_updating_work_item_labels_monthly
+description: Unique users updating a work item's labels
+product_category: team_planning
+product_section: dev
+product_stage: plan
+product_group: project_management
+value_type: number
+status: active
+milestone: '15.5'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100485
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_updating_work_item_labels
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml b/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
index 9865183388f..424552f54e4 100644
--- a/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
+++ b/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - users_viewing_analytics_group_devops_adoption
   - i_analytics_dev_ops_adoption
diff --git a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
index 09940ac08dd..88ed638d23d 100644
--- a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
     - users_viewing_analytics_group_devops_adoption
     - i_analytics_dev_ops_adoption
diff --git a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
index ef67ab7f11e..2b136ef96dd 100644
--- a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
@@ -9,9 +9,12 @@ product_category: web_ide
 value_type: number
 status: active
 time_frame: 7d
+instrumentation_class: AggregatedMetric
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - g_edit_by_web_ide
   - g_edit_by_sfe
diff --git a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
index b3f32ed28c6..4f55e279459 100644
--- a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - i_search_total
   - i_search_advanced
diff --git a/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
index eeb751682c7..e4089d589cc 100644
--- a/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
@@ -9,7 +9,17 @@ product_category: incident_management
 value_type: number
 status: active
 time_frame: 7d
+instrumentation_class: AggregatedMetric
 data_source: redis_hll
+options:
+  aggregate:
+    operator: OR
+    attribute: user_id
+  events:
+    - 'incident_management_alert_status_changed'
+    - 'incident_management_alert_assigned'
+    - 'incident_management_alert_todo'
+    - 'incident_management_alert_create_incident'
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
index 6089b36401e..93228309855 100644
--- a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
@@ -9,7 +9,24 @@ product_category: incident_management
 value_type: number
 status: active
 time_frame: 7d
+instrumentation_class: AggregatedMetric
 data_source: redis_hll
+options:
+  aggregate:
+    operator: OR
+    attribute: user_id
+  events:
+    - 'incident_management_incident_created'
+    - 'incident_management_incident_reopened'
+    - 'incident_management_incident_closed'
+    - 'incident_management_incident_assigned'
+    - 'incident_management_incident_todo'
+    - 'incident_management_incident_comment'
+    - 'incident_management_incident_zoom_meeting'
+    - 'incident_management_incident_published'
+    - 'incident_management_incident_relate'
+    - 'incident_management_incident_unrelate'
+    - 'incident_management_incident_change_confidential'
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
index 5863d5c6d33..8fce94a17e2 100644
--- a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - g_project_management_issue_title_changed
   - g_project_management_issue_description_changed
diff --git a/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml b/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
new file mode 100644
index 00000000000..3ca7b226545
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
@@ -0,0 +1,24 @@
+---
+data_category: optional
+key_path: redis_hll_counters.quickactions.i_quickactions_assign_multiple_weekly
+description: Count of WAU using the `/assign @user1 @user2` quick action
+product_section: dev
+product_stage: plan
+product_group: project_management
+product_category: issue_tracking
+value_type: number
+status: active
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - i_quickactions_assign_multiple
+distribution:
+- ce
+- ee
+tier:
+- premium
+- ultimate
+performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
index 60619deb786..420926c825c 100644
--- a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
     - i_code_review_click_diff_view_setting
     - i_code_review_click_file_browser_setting
diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
index 16186a412b8..f3758f5bd06 100755
--- a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
@@ -46,6 +46,7 @@ options:
   - p_ci_templates_security_secret_detection
   - p_ci_templates_security_license_scanning
   - p_ci_templates_security_coverage_fuzzing
+  - p_ci_templates_security_coverage_fuzzing_latest
   - p_ci_templates_security_api_fuzzing_latest
   - p_ci_templates_security_secure_binaries
   - p_ci_templates_security_dast_api
@@ -56,7 +57,6 @@ options:
   - p_ci_templates_security_dependency_scanning
   - p_ci_templates_security_api_fuzzing
   - p_ci_templates_security_dast
-  - p_ci_templates_security_cluster_image_scanning
   - p_ci_templates_ios_fastlane
   - p_ci_templates_composer
   - p_ci_templates_c
@@ -160,7 +160,6 @@ options:
   - p_ci_templates_implicit_security_secret_detection
   - p_ci_templates_implicit_security_license_scanning
   - p_ci_templates_implicit_security_coverage_fuzzing
-  - p_ci_templates_implicit_security_api_fuzzing_latest
   - p_ci_templates_implicit_security_secure_binaries
   - p_ci_templates_implicit_security_dast_api
   - p_ci_templates_implicit_security_dast_api_latest
@@ -169,7 +168,6 @@ options:
   - p_ci_templates_implicit_security_dependency_scanning
   - p_ci_templates_implicit_security_api_fuzzing
   - p_ci_templates_implicit_security_dast
-  - p_ci_templates_implicit_security_cluster_image_scanning
   - p_ci_templates_kaniko
   - p_ci_templates_qualys_iac_security
   - p_ci_templates_liquibase
diff --git a/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
index f66f4acd853..039e65bcbaa 100644
--- a/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - i_quickactions_approve
   - i_quickactions_assign_single
@@ -43,6 +46,7 @@ options:
   - i_quickactions_parent_epic
   - i_quickactions_promote
   - i_quickactions_publish
+  - i_quickactions_ready
   - i_quickactions_reassign
   - i_quickactions_reassign_reviewer
   - i_quickactions_rebase
diff --git a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
index 28adf6d6d01..19bb7f0ba3c 100644
--- a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.deploy_token_packages_total_unique_counts_weekly
-description: A weekly count of packages published to the registry using a deploy token
+description: A weekly count of unique users who published packages to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: package
@@ -10,8 +11,11 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - i_package_composer_deploy_token
   - i_package_conan_deploy_token
diff --git a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
index e7465b79667..d5576772b91 100644
--- a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - i_package_composer_user
   - i_package_conan_user
diff --git a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
index 513b3ba1f5e..350a7032493 100644
--- a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - i_ecosystem_jira_service_close_issue
   - i_ecosystem_jira_service_cross_reference
diff --git a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
index bb909bd10b2..f29f4d0cf28 100644
--- a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
@@ -9,8 +9,6 @@ product_category:
 value_type: number
 status: active
 milestone: "13.12"
-time_frame: 7d
-data_source: redis_hll
 distribution:
 - ce
 - ee
@@ -18,3 +16,121 @@ tier:
 - free
 - premium
 - ultimate
+instrumentation_class: AggregatedMetric
+time_frame: 7d
+data_source: redis_hll
+options:
+  aggregate:
+    operator: OR
+    attribute: user_id
+  events:
+    - 'i_code_review_user_single_file_diffs'
+    - 'i_code_review_user_create_mr'
+    - 'i_code_review_user_close_mr'
+    - 'i_code_review_user_reopen_mr'
+    - 'i_code_review_user_resolve_thread'
+    - 'i_code_review_user_unresolve_thread'
+    - 'i_code_review_edit_mr_title'
+    - 'i_code_review_edit_mr_desc'
+    - 'i_code_review_user_merge_mr'
+    - 'i_code_review_user_create_mr_comment'
+    - 'i_code_review_user_edit_mr_comment'
+    - 'i_code_review_user_remove_mr_comment'
+    - 'i_code_review_user_create_review_note'
+    - 'i_code_review_user_publish_review'
+    - 'i_code_review_user_create_multiline_mr_comment'
+    - 'i_code_review_user_edit_multiline_mr_comment'
+    - 'i_code_review_user_remove_multiline_mr_comment'
+    - 'i_code_review_user_add_suggestion'
+    - 'i_code_review_user_apply_suggestion'
+    - 'i_code_review_user_assigned'
+    - 'i_code_review_user_review_requested'
+    - 'i_code_review_user_approve_mr'
+    - 'i_code_review_user_unapprove_mr'
+    - 'i_code_review_user_marked_as_draft'
+    - 'i_code_review_user_unmarked_as_draft'
+    - 'i_code_review_user_approval_rule_added'
+    - 'i_code_review_user_approval_rule_deleted'
+    - 'i_code_review_user_approval_rule_edited'
+    - 'i_code_review_user_vs_code_api_request'
+    - 'i_code_review_user_toggled_task_item_status'
+    - 'i_code_review_user_create_mr_from_issue'
+    - 'i_code_review_user_mr_discussion_locked'
+    - 'i_code_review_user_mr_discussion_unlocked'
+    - 'i_code_review_user_time_estimate_changed'
+    - 'i_code_review_user_time_spent_changed'
+    - 'i_code_review_user_assignees_changed'
+    - 'i_code_review_user_reviewers_changed'
+    - 'i_code_review_user_milestone_changed'
+    - 'i_code_review_user_labels_changed'
+    - 'i_code_review_click_diff_view_setting'
+    - 'i_code_review_click_single_file_mode_setting'
+    - 'i_code_review_click_file_browser_setting'
+    - 'i_code_review_click_whitespace_setting'
+    - 'i_code_review_diff_view_inline'
+    - 'i_code_review_diff_view_parallel'
+    - 'i_code_review_file_browser_tree_view'
+    - 'i_code_review_file_browser_list_view'
+    - 'i_code_review_diff_show_whitespace'
+    - 'i_code_review_diff_hide_whitespace'
+    - 'i_code_review_diff_single_file'
+    - 'i_code_review_diff_multiple_files'
+    - 'i_code_review_user_load_conflict_ui'
+    - 'i_code_review_user_resolve_conflict'
+    - 'i_code_review_user_searches_diff'
+    - 'i_code_review_user_resolve_thread_in_issue'
+    - 'i_code_review_widget_nothing_merge_click_new_file'
+    - 'i_code_review_post_merge_delete_branch'
+    - 'i_code_review_post_merge_click_revert'
+    - 'i_code_review_post_merge_click_cherry_pick'
+    - 'i_code_review_post_merge_submit_revert_modal'
+    - 'i_code_review_post_merge_submit_cherry_pick_modal'
+    - 'i_code_review_user_jetbrains_api_request'
+    - 'i_code_review_user_gitlab_cli_api_request'
+    - 'i_code_review_user_create_note_in_ipynb_diff'
+    - 'i_code_review_user_create_note_in_ipynb_diff_mr'
+    - 'i_code_review_user_create_note_in_ipynb_diff_commit'
+    - 'i_code_review_merge_request_widget_test_summary_view'
+    - 'i_code_review_merge_request_widget_test_summary_full_report_clicked'
+    - 'i_code_review_merge_request_widget_test_summary_expand'
+    - 'i_code_review_merge_request_widget_test_summary_expand_success'
+    - 'i_code_review_merge_request_widget_test_summary_expand_warning'
+    - 'i_code_review_merge_request_widget_test_summary_expand_failed'
+    - 'i_code_review_merge_request_widget_accessibility_view'
+    - 'i_code_review_merge_request_widget_accessibility_full_report_clicked'
+    - 'i_code_review_merge_request_widget_accessibility_expand'
+    - 'i_code_review_merge_request_widget_accessibility_expand_success'
+    - 'i_code_review_merge_request_widget_accessibility_expand_warning'
+    - 'i_code_review_merge_request_widget_accessibility_expand_failed'
+    - 'i_code_review_merge_request_widget_code_quality_view'
+    - 'i_code_review_merge_request_widget_code_quality_full_report_clicked'
+    - 'i_code_review_merge_request_widget_code_quality_expand'
+    - 'i_code_review_merge_request_widget_code_quality_expand_success'
+    - 'i_code_review_merge_request_widget_code_quality_expand_warning'
+    - 'i_code_review_merge_request_widget_code_quality_expand_failed'
+    - 'i_code_review_merge_request_widget_terraform_view'
+    - 'i_code_review_merge_request_widget_terraform_full_report_clicked'
+    - 'i_code_review_merge_request_widget_terraform_expand'
+    - 'i_code_review_merge_request_widget_terraform_expand_success'
+    - 'i_code_review_merge_request_widget_terraform_expand_warning'
+    - 'i_code_review_merge_request_widget_terraform_expand_failed'
+    - 'i_code_review_merge_request_widget_metrics_view'
+    - 'i_code_review_merge_request_widget_metrics_full_report_clicked'
+    - 'i_code_review_merge_request_widget_metrics_expand'
+    - 'i_code_review_merge_request_widget_metrics_expand_success'
+    - 'i_code_review_merge_request_widget_metrics_expand_warning'
+    - 'i_code_review_merge_request_widget_metrics_expand_failed'
+    - 'i_code_review_merge_request_widget_status_checks_view'
+    - 'i_code_review_merge_request_widget_status_checks_full_report_clicked'
+    - 'i_code_review_merge_request_widget_status_checks_expand'
+    - 'i_code_review_merge_request_widget_status_checks_expand_success'
+    - 'i_code_review_merge_request_widget_status_checks_expand_warning'
+    - 'i_code_review_merge_request_widget_status_checks_expand_failed'
+    - 'i_code_review_submit_review_approve'
+    - 'i_code_review_submit_review_comment'
+    - 'i_code_review_merge_request_widget_license_compliance_view'
+    - 'i_code_review_merge_request_widget_license_compliance_full_report_clicked'
+    - 'i_code_review_merge_request_widget_license_compliance_expand'
+    - 'i_code_review_merge_request_widget_license_compliance_expand_success'
+    - 'i_code_review_merge_request_widget_license_compliance_expand_warning'
+    - 'i_code_review_merge_request_widget_license_compliance_expand_failed'
diff --git a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
index ce6093ed7fc..e40e7c7f19a 100644
--- a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
@@ -10,8 +10,6 @@ value_type: number
 status: active
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53553/
-time_frame: 7d
-data_source: redis_hll
 distribution:
 - ce
 - ee
@@ -19,3 +17,118 @@ tier:
 - free
 - premium
 - ultimate
+time_frame: 7d
+instrumentation_class: AggregatedMetric
+data_source: redis_hll
+options:
+  aggregate:
+    operator: OR
+    attribute: user_id
+  events:
+    - 'i_code_review_user_single_file_diffs'
+    - 'i_code_review_user_create_mr'
+    - 'i_code_review_user_close_mr'
+    - 'i_code_review_user_reopen_mr'
+    - 'i_code_review_user_resolve_thread'
+    - 'i_code_review_user_unresolve_thread'
+    - 'i_code_review_edit_mr_title'
+    - 'i_code_review_edit_mr_desc'
+    - 'i_code_review_user_merge_mr'
+    - 'i_code_review_user_create_mr_comment'
+    - 'i_code_review_user_edit_mr_comment'
+    - 'i_code_review_user_remove_mr_comment'
+    - 'i_code_review_user_create_review_note'
+    - 'i_code_review_user_publish_review'
+    - 'i_code_review_user_create_multiline_mr_comment'
+    - 'i_code_review_user_edit_multiline_mr_comment'
+    - 'i_code_review_user_remove_multiline_mr_comment'
+    - 'i_code_review_user_add_suggestion'
+    - 'i_code_review_user_apply_suggestion'
+    - 'i_code_review_user_assigned'
+    - 'i_code_review_user_review_requested'
+    - 'i_code_review_user_approve_mr'
+    - 'i_code_review_user_unapprove_mr'
+    - 'i_code_review_user_marked_as_draft'
+    - 'i_code_review_user_unmarked_as_draft'
+    - 'i_code_review_user_approval_rule_added'
+    - 'i_code_review_user_approval_rule_deleted'
+    - 'i_code_review_user_approval_rule_edited'
+    - 'i_code_review_user_toggled_task_item_status'
+    - 'i_code_review_user_create_mr_from_issue'
+    - 'i_code_review_user_mr_discussion_locked'
+    - 'i_code_review_user_mr_discussion_unlocked'
+    - 'i_code_review_user_time_estimate_changed'
+    - 'i_code_review_user_time_spent_changed'
+    - 'i_code_review_user_assignees_changed'
+    - 'i_code_review_user_reviewers_changed'
+    - 'i_code_review_user_milestone_changed'
+    - 'i_code_review_user_labels_changed'
+    - 'i_code_review_click_diff_view_setting'
+    - 'i_code_review_click_single_file_mode_setting'
+    - 'i_code_review_click_file_browser_setting'
+    - 'i_code_review_click_whitespace_setting'
+    - 'i_code_review_diff_view_inline'
+    - 'i_code_review_diff_view_parallel'
+    - 'i_code_review_file_browser_tree_view'
+    - 'i_code_review_file_browser_list_view'
+    - 'i_code_review_diff_show_whitespace'
+    - 'i_code_review_diff_hide_whitespace'
+    - 'i_code_review_diff_single_file'
+    - 'i_code_review_diff_multiple_files'
+    - 'i_code_review_user_load_conflict_ui'
+    - 'i_code_review_user_resolve_conflict'
+    - 'i_code_review_user_searches_diff'
+    - 'i_code_review_user_resolve_thread_in_issue'
+    - 'i_code_review_widget_nothing_merge_click_new_file'
+    - 'i_code_review_post_merge_delete_branch'
+    - 'i_code_review_post_merge_click_revert'
+    - 'i_code_review_post_merge_click_cherry_pick'
+    - 'i_code_review_post_merge_submit_revert_modal'
+    - 'i_code_review_post_merge_submit_cherry_pick_modal'
+    - 'i_code_review_user_create_note_in_ipynb_diff'
+    - 'i_code_review_user_create_note_in_ipynb_diff_mr'
+    - 'i_code_review_user_create_note_in_ipynb_diff_commit'
+    - 'i_code_review_merge_request_widget_test_summary_view'
+    - 'i_code_review_merge_request_widget_test_summary_full_report_clicked'
+    - 'i_code_review_merge_request_widget_test_summary_expand'
+    - 'i_code_review_merge_request_widget_test_summary_expand_success'
+    - 'i_code_review_merge_request_widget_test_summary_expand_warning'
+    - 'i_code_review_merge_request_widget_test_summary_expand_failed'
+    - 'i_code_review_merge_request_widget_accessibility_view'
+    - 'i_code_review_merge_request_widget_accessibility_full_report_clicked'
+    - 'i_code_review_merge_request_widget_accessibility_expand'
+    - 'i_code_review_merge_request_widget_accessibility_expand_success'
+    - 'i_code_review_merge_request_widget_accessibility_expand_warning'
+    - 'i_code_review_merge_request_widget_accessibility_expand_failed'
+    - 'i_code_review_merge_request_widget_code_quality_view'
+    - 'i_code_review_merge_request_widget_code_quality_full_report_clicked'
+    - 'i_code_review_merge_request_widget_code_quality_expand'
+    - 'i_code_review_merge_request_widget_code_quality_expand_success'
+    - 'i_code_review_merge_request_widget_code_quality_expand_warning'
+    - 'i_code_review_merge_request_widget_code_quality_expand_failed'
+    - 'i_code_review_merge_request_widget_terraform_view'
+    - 'i_code_review_merge_request_widget_terraform_full_report_clicked'
+    - 'i_code_review_merge_request_widget_terraform_expand'
+    - 'i_code_review_merge_request_widget_terraform_expand_success'
+    - 'i_code_review_merge_request_widget_terraform_expand_warning'
+    - 'i_code_review_merge_request_widget_terraform_expand_failed'
+    - 'i_code_review_merge_request_widget_metrics_view'
+    - 'i_code_review_merge_request_widget_metrics_full_report_clicked'
+    - 'i_code_review_merge_request_widget_metrics_expand'
+    - 'i_code_review_merge_request_widget_metrics_expand_success'
+    - 'i_code_review_merge_request_widget_metrics_expand_warning'
+    - 'i_code_review_merge_request_widget_metrics_expand_failed'
+    - 'i_code_review_merge_request_widget_status_checks_view'
+    - 'i_code_review_merge_request_widget_status_checks_full_report_clicked'
+    - 'i_code_review_merge_request_widget_status_checks_expand'
+    - 'i_code_review_merge_request_widget_status_checks_expand_success'
+    - 'i_code_review_merge_request_widget_status_checks_expand_warning'
+    - 'i_code_review_merge_request_widget_status_checks_expand_failed'
+    - 'i_code_review_submit_review_approve'
+    - 'i_code_review_submit_review_comment'
+    - 'i_code_review_merge_request_widget_license_compliance_view'
+    - 'i_code_review_merge_request_widget_license_compliance_full_report_clicked'
+    - 'i_code_review_merge_request_widget_license_compliance_expand'
+    - 'i_code_review_merge_request_widget_license_compliance_expand_success'
+    - 'i_code_review_merge_request_widget_license_compliance_expand_warning'
+    - 'i_code_review_merge_request_widget_license_compliance_expand_failed'
diff --git a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
index 0ca1e03ab11..f5e8a10506f 100644
--- a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
@@ -11,7 +11,16 @@ status: active
 milestone: "13.12"
 introduced_by_url:
 time_frame: 7d
+instrumentation_class: AggregatedMetric
 data_source: redis_hll
+options:
+  aggregate:
+    operator: OR
+    attribute: user_id
+  events:
+    - 'i_code_review_user_vs_code_api_request'
+    - 'i_code_review_user_jetbrains_api_request'
+    - 'i_code_review_user_gitlab_cli_api_request'
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
index 1439c31a1cb..3f688886a67 100644
--- a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
@@ -12,8 +12,11 @@ milestone: "13.12"
 introduced_by_url:
 time_frame: 7d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
     - o_pipeline_authoring_unique_users_committing_ciconfigfile
     - o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
diff --git a/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
index a38c2396a5f..41743fd820c 100644
--- a/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_load_performance_testing
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml b/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
index 2c1aee4d4ca..9fe2fcedc8f 100644
--- a/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_browser_performance_testing_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml b/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml
index d325ed2644f..4bbe644cf05 100644
--- a/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml
+++ b/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_cf_provision
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml b/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml
index 8936d4ce21a..8b997583966 100644
--- a/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_build_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml b/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml
index c0d3299d9bf..2b9e53aec36 100644
--- a/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml
+++ b/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_dast_runner_validation
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml b/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml
index 8d39fc698a8..d45893a2022 100644
--- a/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml
+++ b/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_dast_on_demand_scan
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml
index 97a44953b1e..952afc72aec 100644
--- a/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_coverage_fuzzing
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml b/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml
index 4f4e3a05b4d..e08cb7f719f 100644
--- a/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_api_fuzzing_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml b/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
index 08f8340acbd..5b2d521fb07 100644
--- a/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
+++ b/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_secure_binaries
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml b/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml
index b4197326e5c..b10780260cd 100644
--- a/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml
+++ b/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_dast_api
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml b/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml
index 2c804015f3b..37d4e3760d0 100644
--- a/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_dast_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml
index f79388fdfc5..450574ee2ef 100644
--- a/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml
@@ -6,7 +6,7 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_api_fuzzing
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml
index f4d0ac7ff98..5f107f95479 100644
--- a/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml
@@ -6,8 +6,8 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
-milestone: "14.4"
+status: removed
+milestone: '14.4'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71157
 time_frame: 7d
 data_source: redis_hll
@@ -22,4 +22,6 @@ tier:
 - ultimate
 options:
   events:
-    - p_ci_templates_implicit_jobs_deploy_latest
+  - p_ci_templates_implicit_jobs_deploy_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml
index fd4b22fd1e5..c27caf6248e 100644
--- a/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml
@@ -3,11 +3,11 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_sast_
 description: Count of pipelines with implicit runs using the latest SAST IaC template
 product_section: sec
 product_stage: secure
-product_group: "static_analysis"
+product_group: static_analysis
 product_category: SAST
 value_type: number
-status: active
-milestone: "14.5"
+status: removed
+milestone: '14.5'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73076
 time_frame: 7d
 data_source: redis_hll
@@ -24,3 +24,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_sast_iac_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml
index 9b71c66ca77..5f91c203d6f 100644
--- a/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml
@@ -3,11 +3,11 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_sast_iac_
 description: Count of pipelines with implicit runs using the latest SAST IaC template
 product_section: sec
 product_stage: secure
-product_group: "static_analysis"
+product_group: static_analysis
 product_category: SAST
 value_type: number
-status: active
-milestone: "14.5"
+status: removed
+milestone: '14.5'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73074
 time_frame: 7d
 data_source: redis_hll
@@ -24,3 +24,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_sast_iac_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_weekly.yml b/config/metrics/counts_7d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_weekly.yml
index 8d0415dedd2..8b9b17b3519 100644
--- a/config/metrics/counts_7d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_weekly.yml
@@ -6,7 +6,7 @@ product_stage: secure
 product_group: dynamic_analysis
 product_category: dynamic_application_security_testing
 value_type: number
-status: active
+status: removed
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73876
 time_frame: 7d
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_dast_api_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20220222215851_xmau_plan.yml b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
index 170b1c595de..77325a205ee 100644
--- a/config/metrics/counts_7d/20220222215851_xmau_plan.yml
+++ b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
@@ -9,8 +9,19 @@ value_type: number
 status: active
 milestone: '14.9'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
-time_frame: 7d
+instrumentation_class: WorkItemsActivityAggregatedMetric
 data_source: redis_hll
+time_frame: 7d
+options:
+  aggregate:
+    operator: OR
+    attribute: user_id
+  events:
+    - users_creating_work_items
+    - users_updating_work_item_title
+    - users_updating_work_item_dates
+    - users_updating_work_item_labels
+    - users_updating_work_item_iteration
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
index 061ee13722b..c7e712cf92a 100644
--- a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
+++ b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
@@ -10,7 +10,18 @@ status: active
 milestone: '14.9'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
 time_frame: 7d
+instrumentation_class: WorkItemsActivityAggregatedMetric
 data_source: redis_hll
+options:
+  aggregate:
+    operator: OR
+    attribute: user_id
+  events:
+    - users_creating_work_items
+    - users_updating_work_item_title
+    - users_updating_work_item_dates
+    - users_updating_work_item_labels
+    - users_updating_work_item_iteration
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20220222215855_users_work_items.yml b/config/metrics/counts_7d/20220222215855_users_work_items.yml
index b749a7c9430..0985f38c83b 100644
--- a/config/metrics/counts_7d/20220222215855_users_work_items.yml
+++ b/config/metrics/counts_7d/20220222215855_users_work_items.yml
@@ -10,7 +10,18 @@ status: active
 milestone: '14.9'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
 time_frame: 7d
+instrumentation_class: WorkItemsActivityAggregatedMetric
 data_source: redis_hll
+options:
+  aggregate:
+    operator: OR
+    attribute: user_id
+  events:
+    - users_creating_work_items
+    - users_updating_work_item_title
+    - users_updating_work_item_dates
+    - users_updating_work_item_labels
+    - users_updating_work_item_iteration
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml b/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml
index 85e32e385fb..75b4e85a2db 100644
--- a/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml
@@ -1,14 +1,15 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_secret_detection_latest_weekly
-description: Weekly counts for implicit use of Secret Detection CI Latest template (Jobs folder)
+description: Weekly counts for implicit use of Secret Detection CI Latest template
+  (Jobs folder)
 product_section: sec
 product_stage: secure
 product_group: static_analysis
 product_category: static_application_security_testing
 value_type: number
-status: active
-milestone: "15.0"
-introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81847'
+status: removed
+milestone: '15.0'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81847
 time_frame: 7d
 data_source: redis_hll
 data_category: optional
@@ -23,3 +24,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_secret_detection_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml b/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml
index 61d3ceff055..81ee9ea1a68 100644
--- a/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml
@@ -6,9 +6,9 @@ product_stage: secure
 product_group: static_analysis
 product_category: static_application_security_testing
 value_type: number
-status: active
-milestone: "15.0"
-introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81847'
+status: removed
+milestone: '15.0'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81847
 time_frame: 7d
 data_source: redis_hll
 data_category: optional
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_sast_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml
index 851fd6d0925..e40a7d4cba6 100644
--- a/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml
@@ -12,8 +12,11 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82543
 time_frame: 7d
 data_source: redis_hll
 data_category: optional
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
     - error_tracking_view_list
     - error_tracking_view_details
diff --git a/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
index 964297bde96..9146e2c7c8b 100644
--- a/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
@@ -13,8 +13,11 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90205
 time_frame: 7d
 data_source: redis_hll
 data_category: optional
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
     - incident_management_timeline_event_created
     - incident_management_timeline_event_edited
diff --git a/config/metrics/counts_7d/20220719133311_p_ci_templates_implicit_security_fortify_fod_sast_weekly.yml b/config/metrics/counts_7d/20220719133311_p_ci_templates_implicit_security_fortify_fod_sast_weekly.yml
index 4f3cfcc25d4..a234b29127d 100644
--- a/config/metrics/counts_7d/20220719133311_p_ci_templates_implicit_security_fortify_fod_sast_weekly.yml
+++ b/config/metrics/counts_7d/20220719133311_p_ci_templates_implicit_security_fortify_fod_sast_weekly.yml
@@ -6,8 +6,8 @@ product_stage: secure
 product_group: static_analysis
 product_category: SAST
 value_type: number
-status: active
-milestone: "15.3"
+status: removed
+milestone: '15.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91956
 time_frame: 7d
 data_source: redis_hll
@@ -23,3 +23,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_fortify_fod_sast
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20220906065645_incident_management_timeline_event_created_weekly.yml b/config/metrics/counts_7d/20220906065645_incident_management_timeline_event_created_weekly.yml
new file mode 100644
index 00000000000..e249dade5ca
--- /dev/null
+++ b/config/metrics/counts_7d/20220906065645_incident_management_timeline_event_created_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.incident_management.incident_management_timeline_event_created_weekly
+description: Count of unique users created timeline events
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: incident_management
+value_type: number
+status: active
+milestone: "15.5"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97006"
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - incident_management_timeline_event_created
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220906070351_incident_management_timeline_event_edited_weekly.yml b/config/metrics/counts_7d/20220906070351_incident_management_timeline_event_edited_weekly.yml
new file mode 100644
index 00000000000..82be8c1d859
--- /dev/null
+++ b/config/metrics/counts_7d/20220906070351_incident_management_timeline_event_edited_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.incident_management.incident_management_timeline_event_edited_weekly
+description: Count of unique users edited timeline events
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: incident_management
+value_type: number
+status: active
+milestone: "15.5"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97006"
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - incident_management_timeline_event_edited
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20220906070629_incident_management_timeline_event_deleted_weekly.yml b/config/metrics/counts_7d/20220906070629_incident_management_timeline_event_deleted_weekly.yml
new file mode 100644
index 00000000000..dbe8ad10298
--- /dev/null
+++ b/config/metrics/counts_7d/20220906070629_incident_management_timeline_event_deleted_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.incident_management.incident_management_timeline_event_deleted_weekly
+description: Count of unique users deleted timeline events
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: incident_management
+value_type: number
+status: active
+milestone: "15.5"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97006"
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - incident_management_timeline_event_deleted
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20220907032041_i_quickactions_ready_weekly.yml b/config/metrics/counts_7d/20220907032041_i_quickactions_ready_weekly.yml
new file mode 100644
index 00000000000..4e1ec52769e
--- /dev/null
+++ b/config/metrics/counts_7d/20220907032041_i_quickactions_ready_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.project_management.i_quickactions_ready_weekly
+description: Count of WAU using the `/ready` quick action
+product_section: dev
+product_stage: plan
+product_group: project_management
+product_category: issue_tracking
+value_type: number
+data_source: redis_hll
+status: active
+milestone: "15.4"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97115"
+time_frame: 7d
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_ready
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220907084343_p_ci_templates_implicit_security_sast_iac_weekly.yml b/config/metrics/counts_7d/20220907084343_p_ci_templates_implicit_security_sast_iac_weekly.yml
index c8e4c285492..5a07581ac29 100644
--- a/config/metrics/counts_7d/20220907084343_p_ci_templates_implicit_security_sast_iac_weekly.yml
+++ b/config/metrics/counts_7d/20220907084343_p_ci_templates_implicit_security_sast_iac_weekly.yml
@@ -1,13 +1,14 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_sast_iac_weekly
-description: Count of pipelines with implicit SAST runs using the stable SAST IaC template
+description: Count of pipelines with implicit SAST runs using the stable SAST IaC
+  template
 product_section: sec
 product_stage: secure
-product_group: "static_analysis"
+product_group: static_analysis
 product_category: SAST
 value_type: number
-status: active
-milestone: "15.4"
+status: removed
+milestone: '15.4'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86275
 time_frame: 7d
 data_source: redis_hll
@@ -24,3 +25,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_sast_iac
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20220907102710_p_ci_templates_implicit_jobs_sast_iac_weekly.yml b/config/metrics/counts_7d/20220907102710_p_ci_templates_implicit_jobs_sast_iac_weekly.yml
index faf4df4b772..07ad434778f 100644
--- a/config/metrics/counts_7d/20220907102710_p_ci_templates_implicit_jobs_sast_iac_weekly.yml
+++ b/config/metrics/counts_7d/20220907102710_p_ci_templates_implicit_jobs_sast_iac_weekly.yml
@@ -1,13 +1,14 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_sast_iac_weekly
-description: Count of pipelines with implicit SAST jobs using the stable SAST IaC template
+description: Count of pipelines with implicit SAST jobs using the stable SAST IaC
+  template
 product_section: sec
 product_stage: secure
-product_group: "static_analysis"
+product_group: static_analysis
 product_category: SAST
 value_type: number
-status: active
-milestone: "15.4"
+status: removed
+milestone: '15.4'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86275
 time_frame: 7d
 data_source: redis_hll
@@ -24,3 +25,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_sast_iac
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20220912161233_p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220912161233_p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly.yml
index 243d24bcf50..baa9796fff0 100644
--- a/config/metrics/counts_7d/20220912161233_p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220912161233_p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly.yml
@@ -1,14 +1,15 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly
-description: Weekly counts for implicit Dependency Scanning CI Latest template (Jobs folder)
+description: Weekly counts for implicit Dependency Scanning CI Latest template (Jobs
+  folder)
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
 product_category: dependency_scanning
 value_type: number
-status: active
-milestone: "15.4"
-introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323'
+status: removed
+milestone: '15.4'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323
 time_frame: 7d
 data_source: redis_hll
 data_category: optional
@@ -23,3 +24,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_dependency_scanning_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20220912162301_p_ci_templates_implicit_jobs_license_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220912162301_p_ci_templates_implicit_jobs_license_scanning_latest_weekly.yml
index 8fdd6c15c1d..cf4727f2da4 100644
--- a/config/metrics/counts_7d/20220912162301_p_ci_templates_implicit_jobs_license_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220912162301_p_ci_templates_implicit_jobs_license_scanning_latest_weekly.yml
@@ -1,14 +1,15 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_license_scanning_latest_weekly
-description: Weekly counts for implicit License Scanning CI Latest template (Jobs folder)
+description: Weekly counts for implicit License Scanning CI Latest template (Jobs
+  folder)
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
 product_category: license_scanning
 value_type: number
-status: active
-milestone: "15.4"
-introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323'
+status: removed
+milestone: '15.4'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323
 time_frame: 7d
 data_source: redis_hll
 data_category: optional
@@ -23,3 +24,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_jobs_license_scanning_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20220912162745_p_ci_templates_implicit_security_container_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220912162745_p_ci_templates_implicit_security_container_scanning_latest_weekly.yml
index c3818fb819c..e4901cfa05a 100644
--- a/config/metrics/counts_7d/20220912162745_p_ci_templates_implicit_security_container_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220912162745_p_ci_templates_implicit_security_container_scanning_latest_weekly.yml
@@ -1,14 +1,15 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_container_scanning_latest_weekly
-description: Weekly counts for implicit Container Scanning CI Latest template (Security folder)
+description: Weekly counts for implicit Container Scanning CI Latest template (Security
+  folder)
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
 product_category: container_scanning
 value_type: number
-status: active
-milestone: "15.4"
-introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323'
+status: removed
+milestone: '15.4'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323
 time_frame: 7d
 data_source: redis_hll
 data_category: optional
@@ -23,3 +24,5 @@ tier:
 options:
   events:
   - p_ci_templates_implicit_security_container_scanning_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20220913225013_p_ci_templates_security_coverage_fuzzing_latest_weekly.yml b/config/metrics/counts_7d/20220913225013_p_ci_templates_security_coverage_fuzzing_latest_weekly.yml
new file mode 100644
index 00000000000..768390de49d
--- /dev/null
+++ b/config/metrics/counts_7d/20220913225013_p_ci_templates_security_coverage_fuzzing_latest_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_security_coverage_fuzzing_latest_weekly
+description: Weekly counts for Coverage Fuzzing latest CI template
+product_section: sec
+product_stage: secure
+product_group: dynamic_analysis
+product_category: dynamic_application_security_testing
+value_type: number
+status: active
+milestone: "15.5"
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97886'
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_security_coverage_fuzzing_latest
diff --git a/config/metrics/counts_7d/20220913225257_p_ci_templates_implicit_security_coverage_fuzzing_latest_weekly.yml b/config/metrics/counts_7d/20220913225257_p_ci_templates_implicit_security_coverage_fuzzing_latest_weekly.yml
new file mode 100644
index 00000000000..ea231267825
--- /dev/null
+++ b/config/metrics/counts_7d/20220913225257_p_ci_templates_implicit_security_coverage_fuzzing_latest_weekly.yml
@@ -0,0 +1,27 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_coverage_fuzzing_latest_weekly
+description: Weekly counts for implicit Coverage Fuzzing latest CI template
+product_section: sec
+product_stage: secure
+product_group: dynamic_analysis
+product_category: dynamic_application_security_testing
+value_type: number
+status: removed
+milestone: '15.5'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97886
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_implicit_security_coverage_fuzzing_latest
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90163
+milestone_removed: '15.5'
diff --git a/config/metrics/counts_7d/20220922042528_users_updating_work_item_iteration_weekly.yml b/config/metrics/counts_7d/20220922042528_users_updating_work_item_iteration_weekly.yml
new file mode 100644
index 00000000000..aad949867cf
--- /dev/null
+++ b/config/metrics/counts_7d/20220922042528_users_updating_work_item_iteration_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.work_items.users_updating_work_item_iteration_weekly
+description: Unique users updating a work item's iteration
+product_section: team planning
+product_stage: dev
+product_group: plan
+product_category: project_management
+value_type: number
+status: active
+milestone: "15.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98539
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_updating_work_item_iteration
+distribution:
+- ce
+- ee
+tier:
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221006065521_i_quickactions_link_weekly.yml b/config/metrics/counts_7d/20221006065521_i_quickactions_link_weekly.yml
new file mode 100644
index 00000000000..c136840fccf
--- /dev/null
+++ b/config/metrics/counts_7d/20221006065521_i_quickactions_link_weekly.yml
@@ -0,0 +1,26 @@
+key_path: redis_hll_counters.quickactions.i_quickactions_link_weekly
+name: quickactions_timeline_weekly
+description: Count of WAU using the `/link` quick action
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: incident_management
+value_type: number
+status: active
+milestone: "15.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99963
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_link
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml b/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml
new file mode 100644
index 00000000000..55e651328e6
--- /dev/null
+++ b/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.work_items.users_updating_work_item_labels_weekly
+description: Unique users updating a work item's labels
+product_category: team_planning
+product_section: dev
+product_stage: plan
+product_group: project_management
+value_type: number
+status: active
+milestone: '15.5'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100485
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_updating_work_item_labels
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
index d7b16d01d8b..8f3749cc481 100644
--- a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
+++ b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: cycle_analytics
+  event: views
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216175041_merge_request_comment.yml b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
index 2c060e57c49..3713aafe259 100644
--- a/config/metrics/counts_all/20210216175041_merge_request_comment.yml
+++ b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: note
+  event: create_mergerequest
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
index fb8c3b61355..7e82df12c95 100644
--- a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
+++ b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
@@ -4,9 +4,9 @@ key_path: counts.ingress_modsecurity_packets_processed
 description: Cumulative count of packets processed by ModSecurity since Usage Ping
   was last reported
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: web_firewall
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
index ba3575f8b0b..c034d791224 100644
--- a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
+++ b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
@@ -4,9 +4,9 @@ key_path: counts.ingress_modsecurity_packets_anomalous
 description: Cumulative count of packets identified as anomalous by ModSecurity since
   Usage Ping was last reported
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: web_firewall
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
index 92774a9aa54..cbdd3ce0261 100644
--- a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
+++ b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
@@ -4,9 +4,9 @@ key_path: counts.network_policy_forwards
 description: Cumulative count of packets forwarded by Cilium (Container Network Security)
   since Usage Ping was last reported
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: container_network_security
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: container_network_security_category_was_removed
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86351
diff --git a/config/metrics/counts_all/20210216175448_network_policy_drops.yml b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
index 10b6a79205b..2b1dc57255d 100644
--- a/config/metrics/counts_all/20210216175448_network_policy_drops.yml
+++ b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
@@ -4,9 +4,9 @@ key_path: counts.network_policy_drops
 description: Cumulative count of packets dropped by Cilium (Container Network Security)
   since Usage Ping was last reported
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: container_network_security
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: container_network_security_category_was_removed
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86351
diff --git a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
index 3255aa90e63..1dce2aa9922 100644
--- a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
+++ b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
@@ -3,9 +3,9 @@ data_category: operational
 key_path: counts.ingress_modsecurity_logging
 description: Whether or not ModSecurity is set to logging mode
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: web_firewall
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
index 4589c483ae2..2b1a487838e 100644
--- a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
+++ b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
@@ -3,9 +3,9 @@ data_category: operational
 key_path: counts.ingress_modsecurity_blocking
 description: Whether or not ModSecurity is set to blocking mode
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: web_firewall
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
index 9213bbcefb7..8794bfec930 100644
--- a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
+++ b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
@@ -3,9 +3,9 @@ data_category: operational
 key_path: counts.ingress_modsecurity_disabled
 description: Whether or not ModSecurity is disabled within Ingress
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: web_firewall
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
index 659a3b66a8b..9781fa90536 100644
--- a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
+++ b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
@@ -3,9 +3,9 @@ data_category: operational
 key_path: counts.ingress_modsecurity_not_installed
 description: Whether or not ModSecurity has not been installed into the cluster
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: web_firewall
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216180253_snippet_comment.yml b/config/metrics/counts_all/20210216180253_snippet_comment.yml
index f01f62f361d..03e45717517 100644
--- a/config/metrics/counts_all/20210216180253_snippet_comment.yml
+++ b/config/metrics/counts_all/20210216180253_snippet_comment.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: note
+  event: create_snippet
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180255_snippet_create.yml b/config/metrics/counts_all/20210216180255_snippet_create.yml
index 7cea58039e1..9c69c99d694 100644
--- a/config/metrics/counts_all/20210216180255_snippet_create.yml
+++ b/config/metrics/counts_all/20210216180255_snippet_create.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: snippet
+  event: create
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180257_snippet_update.yml b/config/metrics/counts_all/20210216180257_snippet_update.yml
index 5cb80f5e830..d8fee7daa90 100644
--- a/config/metrics/counts_all/20210216180257_snippet_update.yml
+++ b/config/metrics/counts_all/20210216180257_snippet_update.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: snippet
+  event: update
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180413_all_searches.yml b/config/metrics/counts_all/20210216180413_all_searches.yml
index 2f45e0c6e20..abd2e31b8d8 100644
--- a/config/metrics/counts_all/20210216180413_all_searches.yml
+++ b/config/metrics/counts_all/20210216180413_all_searches.yml
@@ -11,6 +11,11 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: null
+  event: all_searches_count
+  include_usage_prefix: false
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180414_navbar_searches.yml b/config/metrics/counts_all/20210216180414_navbar_searches.yml
index b2af79bb43c..9ba086ed271 100644
--- a/config/metrics/counts_all/20210216180414_navbar_searches.yml
+++ b/config/metrics/counts_all/20210216180414_navbar_searches.yml
@@ -11,6 +11,11 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: null
+  event: navbar_searches_count
+  include_usage_prefix: false
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
index 675a9db7a7b..08121468e38 100644
--- a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
+++ b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: wiki_pages
+  event: create
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
index c985d876c96..ffb2ed4227c 100644
--- a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
+++ b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: wiki_pages
+  event: update
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
index 6ac0825996c..75c2d13d744 100644
--- a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
+++ b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: wiki_pages
+  event: delete
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
index 1d71cc632c4..c2294650494 100644
--- a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
+++ b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
@@ -10,6 +10,7 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyDisabledMetric
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index 7755fec3a2c..6de9b8476d4 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: note
+  event: create_commit
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
index 059087a406d..278524f6d79 100644
--- a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
+++ b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
@@ -12,6 +12,10 @@ milestone: "13.3"
 introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38784"
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: wiki_pages
+  event: view
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml b/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
index 185e8a199b6..fcb2be99fab 100644
--- a/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
+++ b/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url:
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: kubernetes_agent
+  event: k8s_api_proxy_request
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml b/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
index 79d9f062999..e84cad9b9a9 100644
--- a/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
+++ b/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91831"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_test_summary_count_view
+  event: view
+  widget: test_summary
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml b/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
index b4887bbe219..92c5605f5fa 100644
--- a/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91831"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_test_summary_count_full_report_clicked
+  event: full_report_clicked
+  widget: test_summary
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml b/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
index 1898fa971fa..6501152e564 100644
--- a/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
+++ b/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91831"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_test_summary_count_expand
+  event: expand
+  widget: test_summary
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml b/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
index 91cd4d7a232..4be50d63e30 100644
--- a/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
+++ b/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91831"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_test_summary_count_expand_success
+  event: expand_success
+  widget: test_summary
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml b/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
index 970d843c58e..d5e36376b4a 100644
--- a/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91831"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_test_summary_count_expand_warning
+  event: expand_warning
+  widget: test_summary
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml b/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
index 9b7c5c61602..fbb2684fa11 100644
--- a/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91831"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_test_summary_count_expand_failed
+  event: expand_failed
+  widget: test_summary
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml b/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
index 215bf8f0a1b..235b5ed838a 100644
--- a/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
+++ b/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93232"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_accessibility_count_view
+  event: view
+  widget: accessibility
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml b/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
index a8792444287..25f62dd0184 100644
--- a/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93232"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_accessibility_count_full_report_clicked
+  event: full_report_clicked
+  widget: accessibility
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml b/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
index d5679b65533..a747a6252e9 100644
--- a/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
+++ b/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93232"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_accessibility_count_expand
+  event: expand
+  widget: accessibility
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml b/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
index 25ef6ab85ca..9d1b51a2bce 100644
--- a/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
+++ b/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93232"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_accessibility_count_expand_success
+  event: expand_success
+  widget: accessibility
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml b/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
index 7939fb8ac7f..3d98561d8eb 100644
--- a/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93232"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_accessibility_count_expand_warning
+  event: expand_warning
+  widget: accessibility
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml b/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
index 9e348eb8e27..b3312480433 100644
--- a/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93232"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_accessibility_count_expand_failed
+  event: expand_failed
+  widget: accessibility
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml b/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
index 1687d346e34..918ff9b362c 100644
--- a/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
+++ b/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93333"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_code_quality_count_view
+  event: view
+  widget: code_quality
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml b/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
index 21ff87b8e39..1fb7bbc070b 100644
--- a/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93333"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_code_quality_count_full_report_clicked
+  event: full_report_clicked
+  widget: code_quality
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml b/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
index 49123b462d9..65315c78f2b 100644
--- a/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
+++ b/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93333"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_code_quality_count_expand
+  event: expand
+  widget: code_quality
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml b/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
index 8b349e04d21..a32d388e58d 100644
--- a/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
+++ b/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93333"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_code_quality_count_expand_success
+  event: expand_success
+  widget: code_quality
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml b/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
index e94c6999711..7287000128e 100644
--- a/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93333"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_code_quality_count_expand_warning
+  event: expand_warning
+  widget: code_quality
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml b/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
index 5e49393afff..1e4d668ba98 100644
--- a/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93333"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_code_quality_count_expand_failed
+  event: expand_failed
+  widget: code_quality
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml b/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
index f523b91b5d9..4f3c66162c3 100644
--- a/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
+++ b/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93340"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_terraform_count_view
+  event: view
+  widget: terraform
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml b/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
index 53eb5770ed5..f98b80e3741 100644
--- a/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93340"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_terraform_count_full_report_clicked
+  event: full_report_clicked
+  widget: terraform
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml b/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
index 0406b84d457..9d4d25d5514 100644
--- a/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
+++ b/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93340"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_terraform_count_expand
+  event: expand
+  widget: terraform
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml b/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
index c497758b543..92f9e149377 100644
--- a/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
+++ b/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93340"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_terraform_count_expand_success
+  event: expand_success
+  widget: terraform
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml b/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
index 1a0a112dc89..aaece878b05 100644
--- a/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93340"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_terraform_count_expand_warning
+  event: expand_warning
+  widget: terraform
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml b/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
index 3e1ac7db1d5..1a382cc30ac 100644
--- a/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93340"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_terraform_count_expand_failed
+  event: expand_failed
+  widget: terraform
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml b/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
index 3542f4fd8ac..39d1bea3536 100644
--- a/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
+++ b/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_license_compliance_count_view
+  event: view
+  widget: license_compliance
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml b/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
index 580d0d4dff3..1258a40add0 100644
--- a/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_license_compliance_count_full_report_clicked
+  event: full_report_clicked
+  widget: license_compliance
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml b/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
index 1829e1c87c0..07a8ac69ae1 100644
--- a/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
+++ b/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_license_compliance_count_expand
+  event: expand
+  widget: license_compliance
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml b/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
index 4a8f35a7c5b..2785964ed25 100644
--- a/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
+++ b/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_license_compliance_count_expand_success
+  event: expand_success
+  widget: license_compliance
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml b/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
index 1ebc20fca26..eabef1927c6 100644
--- a/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_license_compliance_count_expand_warning
+  event: expand_warning
+  widget: license_compliance
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml b/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
index 7fe8263a53e..39d252fa1b3 100644
--- a/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_license_compliance_count_expand_failed
+  event: expand_failed
+  widget: license_compliance
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml b/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
new file mode 100644
index 00000000000..a538e097254
--- /dev/null
+++ b/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
@@ -0,0 +1,23 @@
+---
+key_path: counts.gitlab_for_jira_app_direct_installations
+description: Count active Jira Cloud direct installations
+product_section: dev
+product_stage: ecosystem
+product_group: integrations
+product_category: integrations
+value_type: number
+status: active
+time_frame: all
+data_source: database
+data_category: optional
+instrumentation_class: GitlabForJiraAppDirectInstallationsCountMetric
+milestone: "15.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97674
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml b/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml
new file mode 100644
index 00000000000..fcab9fd1794
--- /dev/null
+++ b/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml
@@ -0,0 +1,23 @@
+---
+key_path: counts.gitlab_for_jira_app_proxy_installations
+description: Count active Jira Cloud installations that are using GitLab as a proxy
+product_section: dev
+product_stage: ecosystem
+product_group: integrations
+product_category: integrations
+value_type: number
+status: active
+time_frame: all
+data_source: database
+data_category: optional
+instrumentation_class: GitlabForJiraAppProxyInstallationsCountMetric
+milestone: "15.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97674
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
index afd8478ae1c..7653505a19f 100644
--- a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -3,9 +3,9 @@ data_category: operational
 key_path: ingress_modsecurity_enabled
 description: Whether or not ModSecurity is enabled within Ingress
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: web_firewall
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: web_firewall_category_was_removed
 value_type: boolean
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/settings/20211201012652_flavor.yml b/config/metrics/settings/20211201012652_flavor.yml
index 8148ad7ad89..01c73de57c0 100644
--- a/config/metrics/settings/20211201012652_flavor.yml
+++ b/config/metrics/settings/20211201012652_flavor.yml
@@ -3,7 +3,7 @@ key_path: database.flavor
 description: What PostgreSQL flavor is being used. Possible values are
   "Amazon Aurora PostgreSQL", "PostgreSQL on Amazon RDS", "Cloud SQL for PostgreSQL",
   "Azure Database for PostgreSQL - Single Server", "Azure Database for PostgreSQL - Flexible Server",
-  or "null".
+  "AlloyDB for PostgreSQL", or "null".
 product_section: enablement
 product_stage: enablement
 product_group: database