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

275 files changed, 2180 insertions, 1111 deletions

diff --git a/config/application.rb b/config/application.rb
index 03c8eadc4b0..368036ce064 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -255,12 +255,17 @@ module Gitlab
     config.assets.precompile << "mailers/*.css"
     config.assets.precompile << "page_bundles/_mixins_and_variables_and_functions.css"
     config.assets.precompile << "page_bundles/admin/application_settings_metrics_and_profiling.css"
+    config.assets.precompile << "page_bundles/admin/geo_nodes.css"
+    config.assets.precompile << "page_bundles/admin/geo_replicable.css"
     config.assets.precompile << "page_bundles/admin/jobs_index.css"
     config.assets.precompile << "page_bundles/alert_management_details.css"
     config.assets.precompile << "page_bundles/alert_management_settings.css"
+    config.assets.precompile << "page_bundles/billings.css"
     config.assets.precompile << "page_bundles/boards.css"
     config.assets.precompile << "page_bundles/build.css"
     config.assets.precompile << "page_bundles/ci_status.css"
+    config.assets.precompile << "page_bundles/cluster_agents.css"
+    config.assets.precompile << "page_bundles/clusters.css"
     config.assets.precompile << "page_bundles/cycle_analytics.css"
     config.assets.precompile << "page_bundles/dashboard_projects.css"
     config.assets.precompile << "page_bundles/dev_ops_reports.css"
@@ -269,10 +274,13 @@ module Gitlab
     config.assets.precompile << "page_bundles/epics.css"
     config.assets.precompile << "page_bundles/error_tracking_details.css"
     config.assets.precompile << "page_bundles/error_tracking_index.css"
+    config.assets.precompile << "page_bundles/graph_charts.css"
     config.assets.precompile << "page_bundles/group.css"
     config.assets.precompile << "page_bundles/ide.css"
     config.assets.precompile << "page_bundles/import.css"
     config.assets.precompile << "page_bundles/incident_management_list.css"
+    config.assets.precompile << "page_bundles/incidents.css"
+    config.assets.precompile << "page_bundles/issues_analytics.css"
     config.assets.precompile << "page_bundles/issues_list.css"
     config.assets.precompile << "page_bundles/issues_show.css"
     config.assets.precompile << "page_bundles/jira_connect.css"
@@ -281,10 +289,12 @@ module Gitlab
     config.assets.precompile << "page_bundles/marketing_popover.css"
     config.assets.precompile << "page_bundles/members.css"
     config.assets.precompile << "page_bundles/merge_conflicts.css"
+    config.assets.precompile << "page_bundles/merge_request_analytics.css"
     config.assets.precompile << "page_bundles/merge_requests.css"
     config.assets.precompile << "page_bundles/milestone.css"
     config.assets.precompile << "page_bundles/new_namespace.css"
     config.assets.precompile << "page_bundles/oncall_schedules.css"
+    config.assets.precompile << "page_bundles/operations.css"
     config.assets.precompile << "page_bundles/escalation_policies.css"
     config.assets.precompile << "page_bundles/pipeline.css"
     config.assets.precompile << "page_bundles/pipeline_schedules.css"
@@ -296,6 +306,8 @@ module Gitlab
     config.assets.precompile << "page_bundles/profiles/preferences.css"
     config.assets.precompile << "page_bundles/project.css"
     config.assets.precompile << "page_bundles/projects_edit.css"
+    config.assets.precompile << "page_bundles/prometheus.css"
+    config.assets.precompile << "page_bundles/releases.css"
     config.assets.precompile << "page_bundles/reports.css"
     config.assets.precompile << "page_bundles/roadmap.css"
     config.assets.precompile << "page_bundles/requirements.css"
@@ -306,11 +318,13 @@ module Gitlab
     config.assets.precompile << "page_bundles/terminal.css"
     config.assets.precompile << "page_bundles/terms.css"
     config.assets.precompile << "page_bundles/todos.css"
+    config.assets.precompile << "page_bundles/tree.css"
     config.assets.precompile << "page_bundles/wiki.css"
     config.assets.precompile << "page_bundles/work_items.css"
     config.assets.precompile << "page_bundles/xterm.css"
     config.assets.precompile << "lazy_bundles/cropper.css"
     config.assets.precompile << "lazy_bundles/select2.css"
+    config.assets.precompile << "lazy_bundles/gridstack.css"
     config.assets.precompile << "performance_bar.css"
     config.assets.precompile << "disable_animations.css"
     config.assets.precompile << "test_environment.css"
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml
index b8689c1c461..c3d9179a160 100644
--- a/config/dependency_decisions.yml
+++ b/config/dependency_decisions.yml
@@ -362,3 +362,10 @@
     :why: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79864#note_845406018
     :versions: [2.0.1]
     :when: 2022-02-24 10:44:26.669326000 Z
+- - :license
+  - gridstack
+  - MIT
+  - :who: Balasankar C
+    :why: https://github.com/gridstack/gridstack.js/blob/v7.0.0/LICENSE
+    :versions: []
+    :when: 2022-10-18 16:24:56.611523399 Z
diff --git a/config/esbuild.config.js b/config/esbuild.config.js
new file mode 100644
index 00000000000..e876436e864
--- /dev/null
+++ b/config/esbuild.config.js
@@ -0,0 +1,59 @@
+const browserslist = require('browserslist');
+const esbuild = require('esbuild');
+
+const ESBUILD_SUPPORTED_TARGETS = new Set([
+  'chrome',
+  'edge',
+  'firefox',
+  'hermes',
+  'ie',
+  'ios',
+  'node',
+  'opera',
+  'rhino',
+  'safari',
+]);
+
+const parseBrowserslist = (browserslistResult) => {
+  return browserslistResult.map((browsers) => {
+    const [family, version] = browsers.split(' ');
+    let normalizedVersion = version;
+
+    // browserslist can return a range: safari15.2-15.4
+    if (version.indexOf('-') >= -1) {
+      // we take the lowest version
+      [normalizedVersion] = version.split('-');
+    }
+
+    return {
+      family,
+      version: normalizedVersion,
+    };
+  });
+};
+
+const mapBrowserslistToESBuildTarget = (browsersList) => {
+  return parseBrowserslist(browsersList)
+    .filter(({ family, version }) => {
+      if (!ESBUILD_SUPPORTED_TARGETS.has(family)) {
+        console.warning('Unknown ESBuild target %s, version %s', family, version);
+        return false;
+      }
+
+      return true;
+    })
+    .map(({ family, version }) => {
+      return `${family}${version}`;
+    });
+};
+
+module.exports = {
+  target: mapBrowserslistToESBuildTarget(browserslist()),
+  supported: {
+    'optional-chain': false,
+    'nullish-coalescing': false,
+    'class-static-field': false,
+    'class-field': false,
+  },
+  implementation: esbuild,
+};
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index ca27ece9196..66aa6071502 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -10,6 +10,7 @@
 - advanced_deployments
 - advisory_database
 - api_security
+- application_instrumentation
 - application_performance
 - attack_emulation
 - audit_events
@@ -25,6 +26,7 @@
 - code_quality
 - code_review
 - code_testing
+- commerce_integrations
 - compliance_management
 - container_registry
 - container_scanning
@@ -38,6 +40,7 @@
 - dedicated
 - delivery
 - dependency_firewall
+- dependency_management
 - dependency_proxy
 - dependency_scanning
 - deployment_management
diff --git a/config/feature_flags/development/add_timing_to_certain_cache_actions.yml b/config/feature_flags/development/add_timing_to_certain_cache_actions.yml
deleted file mode 100644
index c03e49dae8d..00000000000
--- a/config/feature_flags/development/add_timing_to_certain_cache_actions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: add_timing_to_certain_cache_actions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94966
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371657
-milestone: '15.4'
-type: development
-group: group::code review
-default_enabled: false
diff --git a/config/feature_flags/development/about_your_company_registration_flow.yml b/config/feature_flags/development/agent_authorization_include_descendants.yml
index 63c1e42972a..17d3a484395 100644
--- a/config/feature_flags/development/about_your_company_registration_flow.yml
+++ b/config/feature_flags/development/agent_authorization_include_descendants.yml
@@ -1,8 +1,8 @@
 ---
-name: about_your_company_registration_flow
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83345
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355909
-milestone: '14.10'
+name: agent_authorization_include_descendants
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95774
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371310
+milestone: '15.5'
 type: development
-group: group::acquisition
+group: group::configure
 default_enabled: false
diff --git a/config/feature_flags/development/allow_non_blocking_member_refresh.yml b/config/feature_flags/development/allow_non_blocking_member_refresh.yml
deleted file mode 100644
index 44ab1c13e7e..00000000000
--- a/config/feature_flags/development/allow_non_blocking_member_refresh.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: allow_non_blocking_member_refresh
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83619
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357281
-milestone: '14.10'
-type: development
-group: group::authentication and authorization
-default_enabled: false
diff --git a/config/feature_flags/development/skip_checking_namespace_in_query.yml b/config/feature_flags/development/approval_rules_eligible_filter.yml
index 2b9e3cbfe0b..e8d925d08a7 100644
--- a/config/feature_flags/development/skip_checking_namespace_in_query.yml
+++ b/config/feature_flags/development/approval_rules_eligible_filter.yml
@@ -1,8 +1,8 @@
 ---
-name: skip_checking_namespace_in_query
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96559
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370742
-milestone: '15.4'
+name: approval_rules_eligible_filter
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100192
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/376331
+milestone: '15.5'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/remove_user_attributes_groups.yml b/config/feature_flags/development/audit_invalid_approver_rules.yml
index 069d83455f9..eca5ffc25bb 100644
--- a/config/feature_flags/development/remove_user_attributes_groups.yml
+++ b/config/feature_flags/development/audit_invalid_approver_rules.yml
@@ -1,8 +1,8 @@
 ---
-name: remove_user_attributes_groups
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97520
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372047
-milestone: '15.4'
+name: audit_invalid_approver_rules
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98636
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375060
+milestone: '15.5'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/bypass_batch_pop_queueing_for_merge_trains.yml b/config/feature_flags/development/bypass_batch_pop_queueing_for_merge_trains.yml
deleted file mode 100644
index 4517bd5360e..00000000000
--- a/config/feature_flags/development/bypass_batch_pop_queueing_for_merge_trains.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: bypass_batch_pop_queueing_for_merge_trains
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96793
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372366
-milestone: '15.4'
-type: development
-group: group::scalability
-default_enabled: false
diff --git a/config/feature_flags/development/read_package_policy_rule.yml b/config/feature_flags/development/cascade_package_forwarding_settings.yml
index 151c5a8c0b5..2b09c25d6f9 100644
--- a/config/feature_flags/development/read_package_policy_rule.yml
+++ b/config/feature_flags/development/cascade_package_forwarding_settings.yml
@@ -1,8 +1,8 @@
 ---
-name: read_package_policy_rule
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90963
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366711
-milestone: '15.4'
+name: cascade_package_forwarding_settings
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99285
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375761
+milestone: '15.5'
 type: development
 group: group::package
 default_enabled: false
diff --git a/config/feature_flags/development/block_emails_with_failures.yml b/config/feature_flags/development/ci_inbound_job_token_scope.yml
index c06d49346b3..0a7a618531c 100644
--- a/config/feature_flags/development/block_emails_with_failures.yml
+++ b/config/feature_flags/development/ci_inbound_job_token_scope.yml
@@ -1,8 +1,8 @@
 ---
-name: block_emails_with_failures
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96902
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373159
-milestone: '15.4'
+name: ci_inbound_job_token_scope
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99165
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/376063
+milestone: '15.5'
 type: development
-group: group::project management
+group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/ci_increase_includes_to_250.yml b/config/feature_flags/development/ci_increase_includes_to_250.yml
deleted file mode 100644
index b6291ab0cd3..00000000000
--- a/config/feature_flags/development/ci_increase_includes_to_250.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_increase_includes_to_250
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64934
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344449
-milestone: '15.2'
-type: development
-group: group::pipeline authoring
-default_enabled: false
diff --git a/config/feature_flags/development/ci_job_artifacts_cdn.yml b/config/feature_flags/development/ci_job_artifacts_cdn.yml
new file mode 100644
index 00000000000..4a019312ee7
--- /dev/null
+++ b/config/feature_flags/development/ci_job_artifacts_cdn.yml
@@ -0,0 +1,8 @@
+---
+name: ci_job_artifacts_cdn
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98010
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373860
+milestone: '15.5'
+type: development
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/development/ci_limit_complete_hierarchy_size.yml b/config/feature_flags/development/ci_limit_complete_hierarchy_size.yml
index ad0dd85a25a..d6cc8787333 100644
--- a/config/feature_flags/development/ci_limit_complete_hierarchy_size.yml
+++ b/config/feature_flags/development/ci_limit_complete_hierarchy_size.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373719
 milestone: '15.4'
 type: development
 group: group::pipeline execution
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_project_pipeline_config_refactoring.yml b/config/feature_flags/development/ci_project_pipeline_config_refactoring.yml
deleted file mode 100644
index 0338b81caf7..00000000000
--- a/config/feature_flags/development/ci_project_pipeline_config_refactoring.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_project_pipeline_config_refactoring
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97240
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372867
-milestone: '15.4'
-type: development
-group: group::pipeline authoring
-default_enabled: false
diff --git a/config/feature_flags/development/ci_requeue_with_dag_object_hierarchy.yml b/config/feature_flags/development/ci_requeue_with_dag_object_hierarchy.yml
index 5e27510629c..b6f4974915b 100644
--- a/config/feature_flags/development/ci_requeue_with_dag_object_hierarchy.yml
+++ b/config/feature_flags/development/ci_requeue_with_dag_object_hierarchy.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373148
 milestone: '15.4'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_rules_changes_compare.yml b/config/feature_flags/development/ci_rules_changes_compare.yml
deleted file mode 100644
index 094692def26..00000000000
--- a/config/feature_flags/development/ci_rules_changes_compare.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_rules_changes_compare
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90968
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366412
-milestone: '15.3'
-type: development
-group: group::pipeline authoring
-default_enabled: true
diff --git a/config/feature_flags/development/ci_skip_auto_cancelation_on_child_pipelines.yml b/config/feature_flags/development/ci_skip_auto_cancelation_on_child_pipelines.yml
new file mode 100644
index 00000000000..71d5836bee1
--- /dev/null
+++ b/config/feature_flags/development/ci_skip_auto_cancelation_on_child_pipelines.yml
@@ -0,0 +1,8 @@
+---
+name: ci_skip_auto_cancelation_on_child_pipelines
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100854"
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377712
+milestone: '15.5'
+type: development
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/development/ci_variables_refactoring_to_variable.yml b/config/feature_flags/development/ci_variables_refactoring_to_variable.yml
deleted file mode 100644
index 131df28d104..00000000000
--- a/config/feature_flags/development/ci_variables_refactoring_to_variable.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_variables_refactoring_to_variable
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95390
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371559
-milestone: '15.4'
-type: development
-group: group::pipeline authoring
-default_enabled: false
diff --git a/config/feature_flags/development/pages_lets_encrypt_ecdsa.yml b/config/feature_flags/development/content_editor_on_issues.yml
index 866c2438e9f..4527ea3b807 100644
--- a/config/feature_flags/development/pages_lets_encrypt_ecdsa.yml
+++ b/config/feature_flags/development/content_editor_on_issues.yml
@@ -1,8 +1,8 @@
 ---
-name: pages_lets_encrypt_ecdsa
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88125
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363026
-milestone: '15.1'
+name: content_editor_on_issues
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98703
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375172
+milestone: '15.5'
 type: development
 group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/contribution_analytics_optimized_base_query.yml b/config/feature_flags/development/contribution_analytics_optimized_base_query.yml
deleted file mode 100644
index 05ee44a7ee2..00000000000
--- a/config/feature_flags/development/contribution_analytics_optimized_base_query.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: contribution_analytics_optimized_base_query
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91468
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367090
-milestone: '15.2'
-type: development
-group: group::optimize
-default_enabled: true
diff --git a/config/feature_flags/development/ci_update_unlocked_pipeline_artifacts.yml b/config/feature_flags/development/counter_attribute_db_lease_for_update.yml
index ffcd5352751..7c30bb3e913 100644
--- a/config/feature_flags/development/ci_update_unlocked_pipeline_artifacts.yml
+++ b/config/feature_flags/development/counter_attribute_db_lease_for_update.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_update_unlocked_pipeline_artifacts
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97228
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372835
-milestone: '15.4'
+name: counter_attribute_db_lease_for_update
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97912
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/374596
+milestone: '15.5'
 type: development
 group: group::pipeline insights
 default_enabled: false
diff --git a/config/feature_flags/development/process_issue_closure_in_background.yml b/config/feature_flags/development/disable_load_entire_blob_for_diff_viewer.yml
index 6a97cbf888e..5e767e3540b 100644
--- a/config/feature_flags/development/process_issue_closure_in_background.yml
+++ b/config/feature_flags/development/disable_load_entire_blob_for_diff_viewer.yml
@@ -1,8 +1,8 @@
 ---
-name: process_issue_closure_in_background
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94981
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371024
-milestone: '15.4'
+name: disable_load_entire_blob_for_diff_viewer
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99029
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/376330
+milestone: '15.5'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/include_groups_from_group_shares_in_group_transfer_locations.yml b/config/feature_flags/development/enable_minor_delay_during_project_authorizations_refresh.yml
index f92a6b2b1b0..cacc564df73 100644
--- a/config/feature_flags/development/include_groups_from_group_shares_in_group_transfer_locations.yml
+++ b/config/feature_flags/development/enable_minor_delay_during_project_authorizations_refresh.yml
@@ -1,7 +1,7 @@
 ---
-name: include_groups_from_group_shares_in_group_transfer_locations
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96347
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371961
+name: enable_minor_delay_during_project_authorizations_refresh
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97805
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373672
 milestone: '15.4'
 type: development
 group: group::workspace
diff --git a/config/feature_flags/development/escape_gitaly_refs.yml b/config/feature_flags/development/escape_gitaly_refs.yml
deleted file mode 100644
index b42cc4c07e5..00000000000
--- a/config/feature_flags/development/escape_gitaly_refs.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: escape_gitaly_refs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91058
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366437
-milestone: '15.2'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/development/forward_deployment_enabled.yml b/config/feature_flags/development/forward_deployment_enabled.yml
deleted file mode 100644
index 750fad15f15..00000000000
--- a/config/feature_flags/development/forward_deployment_enabled.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: forward_deployment_enabled
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24412
-rollout_issue_url: 
-milestone: '12.8'
-type: development
-group: group::release
-default_enabled: true
diff --git a/config/feature_flags/development/geo_container_repository_replication.yml b/config/feature_flags/development/geo_container_repository_replication.yml
new file mode 100644
index 00000000000..94682cc63cc
--- /dev/null
+++ b/config/feature_flags/development/geo_container_repository_replication.yml
@@ -0,0 +1,8 @@
+---
+name: geo_container_repository_replication
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93690"
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366662
+milestone: '15.5'
+type: development
+group: group::geo
+default_enabled: true
diff --git a/config/feature_flags/development/gl_avatar_for_all_user_avatars.yml b/config/feature_flags/development/gl_avatar_for_all_user_avatars.yml
deleted file mode 100644
index a3fee67a7f6..00000000000
--- a/config/feature_flags/development/gl_avatar_for_all_user_avatars.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: gl_avatar_for_all_user_avatars
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81437
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353477
-milestone: '14.9'
-type: development
-group: group::foundations
-default_enabled: false
diff --git a/config/feature_flags/development/global_search_custom_slis.yml b/config/feature_flags/development/global_search_custom_slis.yml
deleted file mode 100644
index 6dd7cfb12f0..00000000000
--- a/config/feature_flags/development/global_search_custom_slis.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: global_search_custom_slis
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95182
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372107
-milestone: '15.4'
-type: development
-group: group::application performance
-default_enabled: false
diff --git a/config/feature_flags/development/graphql_keyset_pagination_without_next_page_query.yml b/config/feature_flags/development/graphql_keyset_pagination_without_next_page_query.yml
index e289ad9af50..7b4c884a82f 100644
--- a/config/feature_flags/development/graphql_keyset_pagination_without_next_page_query.yml
+++ b/config/feature_flags/development/graphql_keyset_pagination_without_next_page_query.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373792
 milestone: '15.4'
 type: development
 group: group::optimize
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/group_analytics_dashboards_page.yml b/config/feature_flags/development/group_analytics_dashboards_page.yml
new file mode 100644
index 00000000000..8002ddb9204
--- /dev/null
+++ b/config/feature_flags/development/group_analytics_dashboards_page.yml
@@ -0,0 +1,8 @@
+---
+name: group_analytics_dashboards_page
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98767'
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375251
+milestone: '15.5'
+type: development
+group: group::optimize
+default_enabled: false
diff --git a/config/feature_flags/development/hash_oauth_tokens.yml b/config/feature_flags/development/hash_oauth_tokens.yml
index 43cd5672fc4..96bd4a3702e 100644
--- a/config/feature_flags/development/hash_oauth_tokens.yml
+++ b/config/feature_flags/development/hash_oauth_tokens.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367570
 milestone: '15.3'
 type: development
 group: group::authentication and authorization
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/highlight_diffs_renewable_expiration.yml b/config/feature_flags/development/highlight_diffs_renewable_expiration.yml
deleted file mode 100644
index 80635b96240..00000000000
--- a/config/feature_flags/development/highlight_diffs_renewable_expiration.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: highlight_diffs_renewable_expiration
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95356
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370728
-milestone: '15.3'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/highlight_diffs_short_renewable_expiration.yml b/config/feature_flags/development/highlight_diffs_short_renewable_expiration.yml
deleted file mode 100644
index 1f20678b4a6..00000000000
--- a/config/feature_flags/development/highlight_diffs_short_renewable_expiration.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: highlight_diffs_short_renewable_expiration
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95356
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370728
-milestone: '15.3'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/import_export_web_upload_stream.yml b/config/feature_flags/development/import_export_web_upload_stream.yml
deleted file mode 100644
index 59e06fbec43..00000000000
--- a/config/feature_flags/development/import_export_web_upload_stream.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: import_export_web_upload_stream
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93379
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370127
-milestone: '15.3'
-type: development
-group: group::import
-default_enabled: false
diff --git a/config/feature_flags/development/extract_mr_diff_deletions.yml b/config/feature_flags/development/improve_blobs_cache_headers.yml
index 24067f95074..33fb9669106 100644
--- a/config/feature_flags/development/extract_mr_diff_deletions.yml
+++ b/config/feature_flags/development/improve_blobs_cache_headers.yml
@@ -1,8 +1,8 @@
 ---
-name: extract_mr_diff_deletions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96455
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372060
-milestone: '15.4'
+name: improve_blobs_cache_headers
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98110
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/374126
+milestone: '15.5'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/incident_timeline.yml b/config/feature_flags/development/incident_timeline.yml
deleted file mode 100644
index 587ef8b55e8..00000000000
--- a/config/feature_flags/development/incident_timeline.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: incident_timeline
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80802
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353426
-milestone: '14.9'
-type: development
-group: group::respond
-default_enabled: true
diff --git a/config/feature_flags/development/incubation_5mp_google_cloud.yml b/config/feature_flags/development/incubation_5mp_google_cloud.yml
index 1b3ba503f5d..e2118e65961 100644
--- a/config/feature_flags/development/incubation_5mp_google_cloud.yml
+++ b/config/feature_flags/development/incubation_5mp_google_cloud.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371332
 milestone: '14.3'
 type: development
 group: group::incubation
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/gitlab_shell_jwt_token.yml b/config/feature_flags/development/indifferent_wal_location_keys.yml
index 7cb6da2b49f..2d89ad82085 100644
--- a/config/feature_flags/development/gitlab_shell_jwt_token.yml
+++ b/config/feature_flags/development/indifferent_wal_location_keys.yml
@@ -1,8 +1,8 @@
 ---
-name: gitlab_shell_jwt_token
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86148
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360808
-milestone: '15.3'
+name: indifferent_wal_location_keys
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101096
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377989
+milestone: '15.5'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/integration_slack_app_notifications.yml b/config/feature_flags/development/integration_slack_app_notifications.yml
new file mode 100644
index 00000000000..d233194c6d4
--- /dev/null
+++ b/config/feature_flags/development/integration_slack_app_notifications.yml
@@ -0,0 +1,8 @@
+---
+name: integration_slack_app_notifications
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98663
+rollout_issue_url:
+milestone: '15.5'
+type: development
+group: group::integrations
+default_enabled: false
diff --git a/config/feature_flags/development/wiki_find_page_with_normal_repository_rpcs.yml b/config/feature_flags/development/license_from_gitaly.yml
index bad0578d50a..ad79d56a8ab 100644
--- a/config/feature_flags/development/wiki_find_page_with_normal_repository_rpcs.yml
+++ b/config/feature_flags/development/license_from_gitaly.yml
@@ -1,8 +1,8 @@
 ---
-name: wiki_find_page_with_normal_repository_rpcs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95897
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371487
-milestone: '15.4'
+name: license_from_gitaly
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77041
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/374300
+milestone: '15.5'
 type: development
 group: group::gitaly
 default_enabled: false
diff --git a/config/feature_flags/development/remove_user_attributes_projects.yml b/config/feature_flags/development/limit_assignees_per_issuable.yml
index fc1beb42a73..d950b8c2f09 100644
--- a/config/feature_flags/development/remove_user_attributes_projects.yml
+++ b/config/feature_flags/development/limit_assignees_per_issuable.yml
@@ -1,8 +1,8 @@
 ---
-name: remove_user_attributes_projects
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97520
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372047
-milestone: '15.4'
+name: limit_assignees_per_issuable
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95673
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373237
+milestone: '15.5'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/only_allow_merge_if_all_status_checks_passed.yml b/config/feature_flags/development/only_allow_merge_if_all_status_checks_passed.yml
new file mode 100644
index 00000000000..b5fd39354ec
--- /dev/null
+++ b/config/feature_flags/development/only_allow_merge_if_all_status_checks_passed.yml
@@ -0,0 +1,8 @@
+---
+name: only_allow_merge_if_all_status_checks_passed
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96765"
+rollout_issue_url: "https://gitlab.com/gitlab-org/gitlab/-/issues/372340"
+milestone: '15.5'
+type: development
+group: group::compliance
+default_enabled: false
diff --git a/config/feature_flags/development/operational_vulnerabilities_filters.yml b/config/feature_flags/development/operational_vulnerabilities_filters.yml
index 0a96954ef66..93206935a94 100644
--- a/config/feature_flags/development/operational_vulnerabilities_filters.yml
+++ b/config/feature_flags/development/operational_vulnerabilities_filters.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365986
 milestone: '15.2'
 type: development
 group: group::container security
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/override_group_level_protected_environment_settings_permission.yml b/config/feature_flags/development/override_group_level_protected_environment_settings_permission.yml
deleted file mode 100644
index 7e7789e2e8f..00000000000
--- a/config/feature_flags/development/override_group_level_protected_environment_settings_permission.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: override_group_level_protected_environment_settings_permission
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92801
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369875
-milestone: '15.3'
-type: development
-group: group::release
-default_enabled: false
diff --git a/config/feature_flags/development/admin_runners_bulk_delete.yml b/config/feature_flags/development/pipeline_name.yml
index ff285855e96..40557a7d01e 100644
--- a/config/feature_flags/development/admin_runners_bulk_delete.yml
+++ b/config/feature_flags/development/pipeline_name.yml
@@ -1,8 +1,8 @@
 ---
-name: admin_runners_bulk_delete
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81894
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353981
-milestone: '14.9'
+name: pipeline_name
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97502
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/376095
+milestone: '15.5'
 type: development
-group: group::runner
+group: group::delivery
 default_enabled: false
diff --git a/config/feature_flags/development/pipeline_schedules_vue.yml b/config/feature_flags/development/pipeline_schedules_vue.yml
new file mode 100644
index 00000000000..69106660c35
--- /dev/null
+++ b/config/feature_flags/development/pipeline_schedules_vue.yml
@@ -0,0 +1,8 @@
+---
+name: pipeline_schedules_vue
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99155
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375139
+milestone: '15.5'
+type: development
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/development/present_groups_select_all.yml b/config/feature_flags/development/present_groups_select_all.yml
new file mode 100644
index 00000000000..4d8ac160fa0
--- /dev/null
+++ b/config/feature_flags/development/present_groups_select_all.yml
@@ -0,0 +1,8 @@
+---
+name: present_groups_select_all
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93633
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370306
+milestone: '15.5'
+type: development
+group: group::workspace
+default_enabled: false
diff --git a/config/feature_flags/development/realtime_labels.yml b/config/feature_flags/development/realtime_labels.yml
index 6072a4b044a..0c047a09a6d 100644
--- a/config/feature_flags/development/realtime_labels.yml
+++ b/config/feature_flags/development/realtime_labels.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357370
 milestone: '14.10'
 type: development
 group: group::project management
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/refactor_mr_widgets_extensions.yml b/config/feature_flags/development/refactor_mr_widgets_extensions.yml
deleted file mode 100644
index 3f71e786f99..00000000000
--- a/config/feature_flags/development/refactor_mr_widgets_extensions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: refactor_mr_widgets_extensions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70993
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341759
-milestone: '14.4'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/refactor_mr_widgets_extensions_user.yml b/config/feature_flags/development/refactor_mr_widgets_extensions_user.yml
deleted file mode 100644
index aa3c2799100..00000000000
--- a/config/feature_flags/development/refactor_mr_widgets_extensions_user.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: refactor_mr_widgets_extensions_user
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70993
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341759
-milestone: '14.4'
-type: development
-group: group::code review
-default_enabled: false
diff --git a/config/feature_flags/development/remove_namespace_aggregator_delay.yml b/config/feature_flags/development/remove_namespace_aggregator_delay.yml
new file mode 100644
index 00000000000..e9e0268fb55
--- /dev/null
+++ b/config/feature_flags/development/remove_namespace_aggregator_delay.yml
@@ -0,0 +1,8 @@
+---
+name: remove_namespace_aggregator_delay
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99226
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375722
+milestone: '15.5'
+type: development
+group: group::utilization
+default_enabled: false
diff --git a/config/feature_flags/development/runner_registration_control.yml b/config/feature_flags/development/runner_registration_control.yml
deleted file mode 100644
index 56c01bf36e5..00000000000
--- a/config/feature_flags/development/runner_registration_control.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: runner_registration_control
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61407
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336087
-milestone: '14.1'
-type: development
-group: group::runner
-default_enabled: false
diff --git a/config/feature_flags/development/scan_execution_rule_mode.yml b/config/feature_flags/development/scan_execution_rule_mode.yml
index 44c985d6814..6e3dd6acf92 100644
--- a/config/feature_flags/development/scan_execution_rule_mode.yml
+++ b/config/feature_flags/development/scan_execution_rule_mode.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/359883
 milestone: '15.2'
 type: development
 group: group::container security
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/enforce_runner_token_expires_at.yml b/config/feature_flags/development/search_page_vertical_nav.yml
index a1cb3bdcfdd..58088cee802 100644
--- a/config/feature_flags/development/enforce_runner_token_expires_at.yml
+++ b/config/feature_flags/development/search_page_vertical_nav.yml
@@ -1,8 +1,8 @@
 ---
-name: enforce_runner_token_expires_at
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78557
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352008
-milestone: '14.8'
+name: search_page_vertical_nav
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97784
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373613
+milestone: '15.5'
 type: development
-group: group::runner
+group: group::global search
 default_enabled: false
diff --git a/config/feature_flags/development/secure_files_metadata_parsers.yml b/config/feature_flags/development/secure_files_metadata_parsers.yml
new file mode 100644
index 00000000000..2d6eed27f4b
--- /dev/null
+++ b/config/feature_flags/development/secure_files_metadata_parsers.yml
@@ -0,0 +1,8 @@
+---
+name: secure_files_metadata_parsers
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99046
+rollout_issue_url:
+milestone: '15.5'
+type: development
+group: group::incubation
+default_enabled: false
diff --git a/config/feature_flags/development/ci_limit_active_jobs_early.yml b/config/feature_flags/development/set_feature_flag_service.yml
index b7dba0f81e9..f25076177d6 100644
--- a/config/feature_flags/development/ci_limit_active_jobs_early.yml
+++ b/config/feature_flags/development/set_feature_flag_service.yml
@@ -1,7 +1,7 @@
 ---
-name: ci_limit_active_jobs_early
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97700
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373284
+name: set_feature_flag_service
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87028
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373176
 milestone: '15.4'
 type: development
 group: group::pipeline execution
diff --git a/config/feature_flags/development/skip_scheduling_mirrors_for_free.yml b/config/feature_flags/development/skip_scheduling_mirrors_for_free.yml
deleted file mode 100644
index 09f41fa9ff4..00000000000
--- a/config/feature_flags/development/skip_scheduling_mirrors_for_free.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: skip_scheduling_mirrors_for_free
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92377
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367712
-milestone: '15.2'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/mergeability_checks_logger.yml b/config/feature_flags/development/track_delete_source_errors.yml
index 3476d6f2133..57152ed86cd 100644
--- a/config/feature_flags/development/mergeability_checks_logger.yml
+++ b/config/feature_flags/development/track_delete_source_errors.yml
@@ -1,8 +1,8 @@
 ---
-name: mergeability_checks_logger
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96128
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371717
-milestone: '15.4'
+name: track_delete_source_errors
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99028
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377258
+milestone: '15.5'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/trigger_mr_subscription_on_merge_status_change.yml b/config/feature_flags/development/trigger_mr_subscription_on_merge_status_change.yml
new file mode 100644
index 00000000000..058fde35110
--- /dev/null
+++ b/config/feature_flags/development/trigger_mr_subscription_on_merge_status_change.yml
@@ -0,0 +1,8 @@
+---
+name: trigger_mr_subscription_on_merge_status_change
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99213"
+rollout_issue_url: "https://gitlab.com/gitlab-org/gitlab/-/issues/375704"
+milestone: '15.5'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/usage_data_ci_i_testing_test_report_uploaded.yml b/config/feature_flags/development/usage_data_ci_i_testing_test_report_uploaded.yml
deleted file mode 100644
index 1635427485b..00000000000
--- a/config/feature_flags/development/usage_data_ci_i_testing_test_report_uploaded.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_ci_i_testing_test_report_uploaded
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95112
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339720
-milestone: '15.4'
-type: development
-group: group::pipeline insights
-default_enabled: false
diff --git a/config/feature_flags/development/usage_data_i_ci_secrets_management_vault_build_created.yml b/config/feature_flags/development/usage_data_i_ci_secrets_management_vault_build_created.yml
deleted file mode 100644
index 0019b949a98..00000000000
--- a/config/feature_flags/development/usage_data_i_ci_secrets_management_vault_build_created.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_ci_secrets_management_vault_build_created
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46515
-rollout_issue_url: 
-milestone: '13.6'
-type: development
-group: group::configure
-default_enabled: true
diff --git a/config/feature_flags/development/use_gitaly_pagination_for_refs.yml b/config/feature_flags/development/use_gitaly_pagination_for_refs.yml
deleted file mode 100644
index f44233e8d0b..00000000000
--- a/config/feature_flags/development/use_gitaly_pagination_for_refs.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_gitaly_pagination_for_refs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96448
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372049
-milestone: '15.4'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/development/vue_broadcast_messages.yml b/config/feature_flags/development/vue_broadcast_messages.yml
new file mode 100644
index 00000000000..bc9425e93ba
--- /dev/null
+++ b/config/feature_flags/development/vue_broadcast_messages.yml
@@ -0,0 +1,8 @@
+---
+name: vue_broadcast_messages
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98127"
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368847
+milestone: '15.4'
+type: development
+group: group::optimize
+default_enabled: false
diff --git a/config/feature_flags/development/cache_issue_sums.yml b/config/feature_flags/development/webhook_form_mask_url.yml
index 7b8bfc44ce2..445fcb0b6b3 100644
--- a/config/feature_flags/development/cache_issue_sums.yml
+++ b/config/feature_flags/development/webhook_form_mask_url.yml
@@ -1,8 +1,8 @@
 ---
-name: cache_issue_sums
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95048
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365940
-milestone: '15.4'
+name: webhook_form_mask_url
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99995
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/376106
+milestone: '15.5'
 type: development
-group: group::product planning
+group: group::integrations
 default_enabled: false
diff --git a/config/feature_flags/ops/github_importer_attachments_import.yml b/config/feature_flags/ops/github_importer_attachments_import.yml
deleted file mode 100644
index ec4fe144933..00000000000
--- a/config/feature_flags/ops/github_importer_attachments_import.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: github_importer_attachments_import
-introduced_by_url:
-rollout_issue_url:
-milestone: '15.4'
-type: ops
-group: group::import
-default_enabled: false
diff --git a/config/feature_flags/ops/github_importer_issue_events_import.yml b/config/feature_flags/ops/github_importer_issue_events_import.yml
deleted file mode 100644
index 58660ceb287..00000000000
--- a/config/feature_flags/ops/github_importer_issue_events_import.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: github_importer_issue_events_import
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89134
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365977
-milestone: '15.3'
-type: ops
-group: group::import
-default_enabled: false
diff --git a/config/feature_flags/ops/github_importer_single_endpoint_issue_events_import.yml b/config/feature_flags/ops/github_importer_single_endpoint_issue_events_import.yml
deleted file mode 100644
index 88e9db6721f..00000000000
--- a/config/feature_flags/ops/github_importer_single_endpoint_issue_events_import.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: github_importer_single_endpoint_issue_events_import
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89134
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365977
-milestone: '15.3'
-type: ops
-group: group::import
-default_enabled: false
diff --git a/config/feature_flags/ops/github_importer_single_endpoint_notes_import.yml b/config/feature_flags/ops/github_importer_single_endpoint_notes_import.yml
deleted file mode 100644
index 7bbc6fba9e0..00000000000
--- a/config/feature_flags/ops/github_importer_single_endpoint_notes_import.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: github_importer_single_endpoint_notes_import
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67150
-rollout_issue_url:
-milestone: '14.2'
-type: ops
-group: group::import
-default_enabled: false
diff --git a/config/feature_flags/ops/increase_branch_cache_expiry.yml b/config/feature_flags/ops/increase_branch_cache_expiry.yml
deleted file mode 100644
index 61b9d5b9c42..00000000000
--- a/config/feature_flags/ops/increase_branch_cache_expiry.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: increase_branch_cache_expiry
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96739
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372331
-milestone: '15.4'
-type: ops
-group: group::code review
-default_enabled: false
diff --git a/config/feature_flags/ops/jira_raise_timeouts.yml b/config/feature_flags/ops/jira_raise_timeouts.yml
index d1ab0ff0670..ac572b172fc 100644
--- a/config/feature_flags/ops/jira_raise_timeouts.yml
+++ b/config/feature_flags/ops/jira_raise_timeouts.yml
@@ -1,7 +1,7 @@
 ---
 name: jira_raise_timeouts
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86439
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375587
 milestone: '15.0'
 type: ops
 group: group::integrations
diff --git a/config/feature_flags/ops/sidekiq_memory_killer_read_only_mode.yml b/config/feature_flags/ops/sidekiq_memory_killer_read_only_mode.yml
new file mode 100644
index 00000000000..aa5cb754aff
--- /dev/null
+++ b/config/feature_flags/ops/sidekiq_memory_killer_read_only_mode.yml
@@ -0,0 +1,7 @@
+---
+name: sidekiq_memory_killer_read_only_mode
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98519
+milestone: '15.5'
+type: ops
+group: group::application performance
+default_enabled: false
diff --git a/config/feature_flags/undefined/gitaly_simplify_find_local_branches_response.yml b/config/feature_flags/undefined/gitaly_simplify_find_local_branches_response.yml
deleted file mode 100644
index c82f8ee26b7..00000000000
--- a/config/feature_flags/undefined/gitaly_simplify_find_local_branches_response.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: gitaly_simplify_find_local_branches_response
-introduced_by_url: https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4850
-rollout_issue_url: https://gitlab.com/gitlab-org/gitaly/-/issues/4452
-milestone: '15.4'
-type: undefined
-group: group::gitaly
-default_enabled: false
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index da950c54fbf..050d112843f 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -505,6 +505,11 @@ production: &base
   # Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc.
   # Please read here for more information: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job
   cron_jobs:
+    # Interval, in seconds, for each Sidekiq process to check for scheduled cron jobs that need to be enqueued. If set
+    # to 0, disable polling for cron jobs entirely. This is useful in setups with multiple Sidekiq processes if you want
+    # to limit which ones perform this task. Note that at least one process in your instance needs to have polling
+    # enabled for cron jobs to be executed.
+    poll_interval: 30
     # Flag stuck CI jobs as failed
     stuck_ci_jobs_worker:
       cron: "0 * * * *"
diff --git a/config/gitlab_loose_foreign_keys.yml b/config/gitlab_loose_foreign_keys.yml
index c5c2d0a61b9..1530c681eb0 100644
--- a/config/gitlab_loose_foreign_keys.yml
+++ b/config/gitlab_loose_foreign_keys.yml
@@ -70,6 +70,10 @@ ci_pipeline_chat_data:
   - table: chat_names
     column: chat_name_id
     on_delete: async_delete
+ci_pipeline_metadata:
+  - table: projects
+    column: project_id
+    on_delete: async_delete
 ci_pipeline_schedules:
   - table: users
     column: owner_id
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 3fc4b56f458..45307c3454b 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -183,6 +183,7 @@ Settings.gitlab['default_project_creation'] ||= ::Gitlab::Access::DEVELOPER_MAIN
 Settings.gitlab['default_project_deletion_protection'] ||= false
 Settings.gitlab['default_projects_limit'] ||= 100000
 Settings.gitlab['default_branch_protection'] ||= 2
+# `default_can_create_group` is deprecated since GitLab 15.5 in favour of the `can_create_group` column on `ApplicationSetting`.
 Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil?
 Settings.gitlab['default_theme'] = Gitlab::Themes::APPLICATION_DEFAULT if Settings.gitlab['default_theme'].nil?
 Settings.gitlab['host'] ||= ENV['GITLAB_HOST'] || 'localhost'
@@ -456,6 +457,7 @@ if Gitlab.ee? && Settings['ee_cron_jobs']
   Settings.cron_jobs.merge!(Settings.ee_cron_jobs)
 end
 
+Settings.cron_jobs['poll_interval'] ||= 30
 Settings.cron_jobs['stuck_ci_jobs_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['stuck_ci_jobs_worker']['cron'] ||= '0 * * * *'
 Settings.cron_jobs['stuck_ci_jobs_worker']['job_class'] = 'StuckCiJobsWorker'
@@ -655,7 +657,7 @@ Settings.cron_jobs['ci_runner_versions_reconciliation_worker'] ||= Settingslogic
 Settings.cron_jobs['ci_runner_versions_reconciliation_worker']['cron'] ||= '@daily'
 Settings.cron_jobs['ci_runner_versions_reconciliation_worker']['job_class'] = 'Ci::Runners::ReconcileExistingRunnerVersionsCronWorker'
 Settings.cron_jobs['users_migrate_records_to_ghost_user_in_batches_worker'] ||= Settingslogic.new({})
-Settings.cron_jobs['users_migrate_records_to_ghost_user_in_batches_worker']['cron'] ||= '*/1 * * * *'
+Settings.cron_jobs['users_migrate_records_to_ghost_user_in_batches_worker']['cron'] ||= '*/2 * * * *'
 Settings.cron_jobs['users_migrate_records_to_ghost_user_in_batches_worker']['job_class'] = 'Users::MigrateRecordsToGhostUserInBatchesWorker'
 
 Gitlab.ee do
@@ -779,9 +781,9 @@ Gitlab.ee do
   Settings.cron_jobs['security_orchestration_policy_rule_schedule_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['security_orchestration_policy_rule_schedule_worker']['cron'] ||= '*/15 * * * *'
   Settings.cron_jobs['security_orchestration_policy_rule_schedule_worker']['job_class'] = 'Security::OrchestrationPolicyRuleScheduleWorker'
-  Settings.cron_jobs['security_findings_cleanup_worker'] ||= Settingslogic.new({})
-  Settings.cron_jobs['security_findings_cleanup_worker']['cron'] ||= '0 */4 * * 6,0'
-  Settings.cron_jobs['security_findings_cleanup_worker']['job_class'] = 'Security::Findings::CleanupWorker'
+  Settings.cron_jobs['security_scans_purge_worker'] ||= Settingslogic.new({})
+  Settings.cron_jobs['security_scans_purge_worker']['cron'] ||= '0 */4 * * 6,0'
+  Settings.cron_jobs['security_scans_purge_worker']['job_class'] = 'Security::Scans::PurgeWorker'
   Settings.cron_jobs['app_sec_dast_profile_schedule_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['app_sec_dast_profile_schedule_worker']['cron'] ||= '7-59/15 * * * *'
   Settings.cron_jobs['app_sec_dast_profile_schedule_worker']['job_class'] = 'AppSec::Dast::ProfileScheduleWorker'
@@ -1045,6 +1047,7 @@ Settings.shutdown['blackout_seconds'] ||= 10
 #
 if Rails.env.test?
   Settings.gitlab['default_projects_limit']   = 42
+  # `default_can_create_group` is deprecated since GitLab 15.5 in favour of the `can_create_group` column on `ApplicationSetting`.
   Settings.gitlab['default_can_create_group'] = true
   Settings.gitlab['default_can_create_team']  = false
 end
diff --git a/config/initializers/7_redis.rb b/config/initializers/7_redis.rb
index 1e2786db413..7773740fec4 100644
--- a/config/initializers/7_redis.rb
+++ b/config/initializers/7_redis.rb
@@ -4,12 +4,6 @@ require 'gitlab/redis'
 
 Redis.raise_deprecations = true unless Rails.env.production?
 
-# We set the instance variable directly to suppress warnings.
-# We cannot switch to the new behavior until we change all existing `redis.exists` calls to `redis.exists?`.
-# Some gems also need to be updated
-# https://gitlab.com/gitlab-org/gitlab/-/issues/340602
-Redis.instance_variable_set(:@exists_returns_integer, false)
-
 Redis::Client.prepend(Gitlab::Instrumentation::RedisInterceptor)
 
 # Make sure we initialize a Redis connection pool before multi-threaded
diff --git a/config/initializers/attr_encrypted_no_db_connection.rb b/config/initializers/attr_encrypted_no_db_connection.rb
deleted file mode 100644
index d9e943bd249..00000000000
--- a/config/initializers/attr_encrypted_no_db_connection.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-raise 'This patch is only tested with attr_encrypted v3.1.0' unless AttrEncrypted::Version.string == '3.1.0'
-
-module AttrEncrypted
-  module Adapters
-    module ActiveRecord
-      module GitlabMonkeyPatches
-        # Prevent attr_encrypted from defining virtual accessors for encryption
-        # data when the code and schema are out of sync. See this issue for more
-        # details: https://github.com/attr-encrypted/attr_encrypted/issues/332
-        def attribute_instance_methods_as_symbols_available?
-          false
-        end
-
-        protected
-
-        # The attr_encrypted gem is not actively maintained
-        # At the same time it contains the code that raises kwargs deprecation warnings:
-        # https://github.com/attr-encrypted/attr_encrypted/blob/master/lib/attr_encrypted/adapters/active_record.rb#L65
-        #
-        def attr_encrypted(*attrs)
-          super
-
-          attr = attrs.first
-
-          redefine_method(:"#{attr}_changed?") do |**options|
-            attribute_changed?(attr, **options)
-          end
-        end
-      end
-    end
-  end
-end
-
-# As of v3.1.0, the attr_encrypted gem defines the AttrEncrypted and
-# AttrEncrypted::Adapters::ActiveRecord modules, and uses "extend" to mix them
-# into the ActiveRecord::Base class. This intervention overrides utility methods
-# defined by attr_encrypted to fix two bugs, as detailed above.
-#
-# The methods are used here: https://github.com/attr-encrypted/attr_encrypted/blob/3.1.0/lib/attr_encrypted.rb#L145-158
-ActiveSupport.on_load(:active_record) do
-  extend AttrEncrypted::Adapters::ActiveRecord::GitlabMonkeyPatches
-end
diff --git a/config/initializers/attr_encrypted_thread_safe.rb b/config/initializers/attr_encrypted_thread_safe.rb
deleted file mode 100644
index be0bb56ffdc..00000000000
--- a/config/initializers/attr_encrypted_thread_safe.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-# As of v3.1.0, attr_encrypted is not thread-safe because all instances share the same `encrypted_attributes`
-# This was fixed in https://github.com/attr-encrypted/attr_encrypted/commit/d4ca0e2073ca6ba5035997ce25f7fc0b4bfbe39e
-# but no release was made after that so we have to patch it ourselves here
-
-module AttrEncrypted
-  module InstanceMethods
-    def encrypted_attributes
-      @encrypted_attributes ||= begin
-        duplicated = {}
-        self.class.encrypted_attributes.map { |key, value| duplicated[key] = value.dup }
-        duplicated
-      end
-    end
-  end
-end
diff --git a/config/initializers/countries.rb b/config/initializers/countries.rb
index 9f8592ba641..52537b5d885 100644
--- a/config/initializers/countries.rb
+++ b/config/initializers/countries.rb
@@ -4,8 +4,9 @@ ISO3166.configure do |config|
   config.locales = [:en]
 end
 
-# GitLab permits users to sign up in Ukraine except the Crimean Region: https://about.gitlab.com/handbook/people-operations/code-of-conduct/#trade-compliance-exportimport-control
-# This overrides the display name for Ukraine to Ukraine (except Crimean Region)
+# GitLab permits users to sign up in Ukraine except for the regions: Crimea, Donetsk, and Luhansk: https://about.gitlab.com/handbook/people-operations/code-of-conduct/#trade-compliance-exportimport-control
+# This overrides the display name for Ukraine to 'Ukraine (except the Crimea, Donetsk, and Luhansk regions)'
+# See: https://gitlab.com/gitlab-org/gitlab/-/issues/374946
 # To be removed after https://gitlab.com/gitlab-org/gitlab/issues/14784 is implemented
 # Data fetched is based on https://github.com/hexorx/countries/blob/master/lib/countries/data/countries/UA.yaml
 ISO3166::Data.register(
@@ -22,7 +23,7 @@ ISO3166::Data.register(
   international_prefix: '810',
   ioc: "UKR",
   gec: "UP",
-  name: "Ukraine (except Crimean Region)",
+  name: "Ukraine (except the Crimea, Donetsk, and Luhansk regions)",
   national_destination_code_lengths: [2],
   national_number_lengths: [8, 9],
   national_prefix: '8',
diff --git a/config/initializers/diagnostic_reports.rb b/config/initializers/diagnostic_reports.rb
index b9932822a0b..47266f99f2d 100644
--- a/config/initializers/diagnostic_reports.rb
+++ b/config/initializers/diagnostic_reports.rb
@@ -2,9 +2,7 @@
 
 return unless Gitlab::Utils.to_boolean(ENV['GITLAB_DIAGNOSTIC_REPORTS_ENABLED'])
 
-# Any actions beyond this check should only execute outside of tests,
-# when running in application context (i.e. not in the Rails console or rspec)
-return unless Gitlab::Runtime.application?
+return unless Gitlab::Runtime.puma?
 
 Gitlab::Cluster::LifecycleEvents.on_worker_start do
   Gitlab::Memory::ReportsDaemon.instance.start
diff --git a/config/initializers/licensee_license_patch.rb b/config/initializers/licensee_license_patch.rb
new file mode 100644
index 00000000000..d4680db5071
--- /dev/null
+++ b/config/initializers/licensee_license_patch.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'licensee/license'
+
+module Licensee
+  module LicensePatch
+    # Patch from https://github.com/licensee/licensee/pull/589
+    def ==(other)
+      other.is_a?(self.class) && key == other.key
+    end
+  end
+
+  License.prepend LicensePatch
+end
diff --git a/config/initializers/load_balancing.rb b/config/initializers/load_balancing.rb
index bcc62a6be5d..aa621602573 100644
--- a/config/initializers/load_balancing.rb
+++ b/config/initializers/load_balancing.rb
@@ -2,6 +2,15 @@
 
 Gitlab::Application.configure do |config|
   config.middleware.use(Gitlab::Database::LoadBalancing::RackMiddleware)
+
+  # We need re-rerun the setup when code reloads in development
+  config.reloader.to_prepare do
+    if Gitlab.dev_or_test_env?
+      Gitlab::Database::LoadBalancing.base_models.each do |model|
+        Gitlab::Database::LoadBalancing::Setup.new(model).setup
+      end
+    end
+  end
 end
 
 Gitlab::Database::LoadBalancing.base_models.each do |model|
@@ -14,13 +23,6 @@ Gitlab::Database::LoadBalancing.base_models.each do |model|
   # information.
   Gitlab::Database::LoadBalancing::Setup.new(model).setup
 
-  # We need re-rerun the setup when code reloads in development
-  Rails.application.reloader.to_prepare do
-    if Rails.env.development? || Rails.env.test?
-      Gitlab::Database::LoadBalancing::Setup.new(model).setup
-    end
-  end
-
   # Database queries may be run before we fork, so we must set up the load
   # balancer as early as possible. When we do fork, we need to make sure all the
   # hosts are disconnected.
diff --git a/config/initializers/memory_watchdog.rb b/config/initializers/memory_watchdog.rb
index 82ad615ce25..ce8e5029e7a 100644
--- a/config/initializers/memory_watchdog.rb
+++ b/config/initializers/memory_watchdog.rb
@@ -4,17 +4,33 @@ return unless Gitlab::Runtime.application?
 return unless Gitlab::Utils.to_boolean(ENV['GITLAB_MEMORY_WATCHDOG_ENABLED'])
 
 Gitlab::Cluster::LifecycleEvents.on_worker_start do
-  handler =
-    if Gitlab::Runtime.puma?
-      Gitlab::Memory::Watchdog::PumaHandler.new
-    elsif Gitlab::Runtime.sidekiq?
-      Gitlab::Memory::Watchdog::TermProcessHandler.new
-    else
-      Gitlab::Memory::Watchdog::NullHandler.instance
-    end
+  watchdog = Gitlab::Memory::Watchdog.new
+  max_strikes = ENV.fetch('GITLAB_MEMWD_MAX_STRIKES', 5).to_i
+  sleep_time_seconds = ENV.fetch('GITLAB_MEMWD_SLEEP_TIME_SEC', 60).to_i
+  max_mem_growth = ENV.fetch('GITLAB_MEMWD_MAX_MEM_GROWTH', 3.0).to_f
+  max_heap_frag = ENV.fetch('GITLAB_MEMWD_MAX_HEAP_FRAG', 0.5).to_f
+
+  watchdog.configure do |config|
+    config.handler =
+      if Gitlab::Runtime.puma?
+        Gitlab::Memory::Watchdog::PumaHandler.new
+      elsif Gitlab::Runtime.sidekiq?
+        Gitlab::Memory::Watchdog::TermProcessHandler.new
+      else
+        Gitlab::Memory::Watchdog::NullHandler.instance
+      end
+
+    config.logger = Gitlab::AppLogger
+    config.sleep_time_seconds = sleep_time_seconds
+    # config.monitor.use MonitorClass, args*, max_strikes:, kwargs**, &block
+    config.monitors.use Gitlab::Memory::Watchdog::Monitor::HeapFragmentation,
+      max_heap_fragmentation: max_heap_frag,
+      max_strikes: max_strikes
+
+    config.monitors.use Gitlab::Memory::Watchdog::Monitor::UniqueMemoryGrowth,
+      max_mem_growth: max_mem_growth,
+      max_strikes: max_strikes
+  end
 
-  watchdog = Gitlab::Memory::Watchdog.new(
-    handler: handler, logger: Gitlab::AppLogger
-  )
   Gitlab::BackgroundTask.new(watchdog).start
 end
diff --git a/config/initializers/multi_json.rb b/config/initializers/multi_json.rb
index 5f98ce1961f..f382e2cb995 100644
--- a/config/initializers/multi_json.rb
+++ b/config/initializers/multi_json.rb
@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
 # Explicitly set the JSON adapter used by MultiJson
-# Currently we want this to default to the existing json gem
+#
+# This changes the default JSON adapter used by any gem dependencies
+# we have that rely on MultiJson for their JSON handling. We set this
+# to `oj` for a universal performance improvement in JSON handling
+# across those gems.
+
 MultiJson.use(:oj)
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 2454b5ea818..707e4efe7bf 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -11,23 +11,12 @@ if Gitlab::Auth::Ldap::Config.enabled?
   end
 end
 
-module OmniAuth
-  module Strategies
-    class AzureActivedirectoryV2
-      # override until https://github.com/RIPAGlobal/omniauth-azure-activedirectory-v2/pull/6 is merged
-      def callback_url
-        full_host + callback_path
-      end
-    end
-  end
-end
-
 OmniAuth.config.full_host = Gitlab::OmniauthInitializer.full_host
 
 OmniAuth.config.allowed_request_methods = [:post]
 # In case of auto sign-in, the GET method is used (users don't get to click on a button)
 OmniAuth.config.allowed_request_methods << :get if Gitlab.config.omniauth.auto_sign_in_with_provider.present?
-OmniAuth.config.before_request_phase do |env|
+OmniAuth.config.request_validation_phase do |env|
   Gitlab::RequestForgeryProtection.call(env)
 end
 
diff --git a/config/initializers/sawyer_patch.rb b/config/initializers/sawyer_patch.rb
index 08d249645cc..34d2843d165 100644
--- a/config/initializers/sawyer_patch.rb
+++ b/config/initializers/sawyer_patch.rb
@@ -24,6 +24,16 @@ module SawyerClassPatch
           end
         else
           define_method attribute do
+            Gitlab::Import::Logger.warn(
+              Gitlab::ApplicationContext.current.merge(
+                {
+                  message: 'Sawyer attribute called',
+                  attribute: attribute,
+                  caller: Gitlab::BacktraceCleaner.clean_backtrace(caller)
+                }
+              )
+            )
+
             @attrs[attribute.to_sym]
           end
 
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 262ef1dea21..cef34425bf4 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -5,6 +5,16 @@ module SidekiqLogArguments
   end
 end
 
+def load_cron_jobs!
+  Sidekiq::Cron::Job.load_from_hash! Gitlab::SidekiqConfig.cron_jobs
+
+  Gitlab.ee do
+    Gitlab::Mirror.configure_cron_job!
+
+    Gitlab::Geo.configure_cron_jobs!
+  end
+end
+
 def enable_reliable_fetch?
   return true unless Feature::FlipperFeature.table_exists?
 
@@ -23,8 +33,6 @@ queues_config_hash[:namespace] = Gitlab::Redis::Queues::SIDEKIQ_NAMESPACE
 
 enable_json_logs = Gitlab.config.sidekiq.log_format == 'json'
 enable_sidekiq_memory_killer = ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS'].to_i.nonzero?
-use_sidekiq_daemon_memory_killer = ENV.fetch("SIDEKIQ_DAEMON_MEMORY_KILLER", 1).to_i.nonzero?
-use_sidekiq_legacy_memory_killer = !use_sidekiq_daemon_memory_killer
 
 Sidekiq.configure_server do |config|
   config.options[:strict] = false
@@ -45,8 +53,7 @@ Sidekiq.configure_server do |config|
 
   config.server_middleware(&Gitlab::SidekiqMiddleware.server_configurator(
     metrics: Settings.monitoring.sidekiq_exporter,
-    arguments_logger: SidekiqLogArguments.enabled? && !enable_json_logs,
-    memory_killer: enable_sidekiq_memory_killer && use_sidekiq_legacy_memory_killer
+    arguments_logger: SidekiqLogArguments.enabled? && !enable_json_logs
   ))
 
   config.client_middleware(&Gitlab::SidekiqMiddleware.client_configurator)
@@ -62,7 +69,7 @@ Sidekiq.configure_server do |config|
     # To cancel job, it requires `SIDEKIQ_MONITOR_WORKER=1` to enable notification channel
     Gitlab::SidekiqDaemon::Monitor.instance.start
 
-    Gitlab::SidekiqDaemon::MemoryKiller.instance.start if enable_sidekiq_memory_killer && use_sidekiq_daemon_memory_killer
+    Gitlab::SidekiqDaemon::MemoryKiller.instance.start if enable_sidekiq_memory_killer
 
     first_sidekiq_worker = !ENV['SIDEKIQ_WORKER_ID'] || ENV['SIDEKIQ_WORKER_ID'] == '0'
     health_checks = Settings.monitoring.sidekiq_health_checks
@@ -81,30 +88,10 @@ Sidekiq.configure_server do |config|
     Sidekiq::ReliableFetch.setup_reliable_fetch!(config)
   end
 
-  Gitlab.config.load_dynamic_cron_schedules!
-
-  # Sidekiq-cron: load recurring jobs from gitlab.yml
-  # UGLY Hack to get nested hash from settingslogic
-  cron_jobs = Gitlab::Json.parse(Gitlab.config.cron_jobs.to_json)
-  # UGLY hack: Settingslogic doesn't allow 'class' key
-  cron_jobs_required_keys = %w(job_class cron)
-  cron_jobs.each do |k, v|
-    if cron_jobs[k] && cron_jobs_required_keys.all? { |s| cron_jobs[k].key?(s) }
-      cron_jobs[k]['class'] = cron_jobs[k].delete('job_class')
-    else
-      cron_jobs.delete(k)
-      Gitlab::AppLogger.error("Invalid cron_jobs config key: '#{k}'. Check your gitlab config file.")
-    end
-  end
-  Sidekiq::Cron::Job.load_from_hash! cron_jobs
-
   Gitlab::SidekiqVersioning.install!
 
-  Gitlab.ee do
-    Gitlab::Mirror.configure_cron_job!
-
-    Gitlab::Geo.configure_cron_jobs!
-  end
+  config.options[:cron_poll_interval] = Gitlab.config.cron_jobs.poll_interval
+  load_cron_jobs!
 
   # Avoid autoload issue such as 'Mail::Parsers::AddressStruct'
   # https://github.com/mikel/mail/issues/912#issuecomment-214850355
@@ -127,4 +114,3 @@ end
 
 Sidekiq::Scheduled::Poller.prepend Gitlab::Patch::SidekiqPoller
 Sidekiq::Cron::Poller.prepend Gitlab::Patch::SidekiqPoller
-Sidekiq::Cron::Poller.prepend Gitlab::Patch::SidekiqCronPoller
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index 81e4f73e6b2..0b3b5af48a1 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -98,17 +98,17 @@ en:
         Grants read-only access to the user's primary email address using OpenID Connect.
     project_access_token_scope_desc:
       api:
-        Grants complete read/write access to the scoped project API.
+        Grants complete read and write access to the scoped project API, including the Package Registry.
       read_api:
-        Grants read access to the scoped project API.
+        Grants read access to the scoped project API, including the Package Registry.
       read_repository:
-        Allows read-only access (pull) to the repository.
+        Grants read access (pull) to the repository.
       write_repository:
-        Allows read-write access (pull, push) to the repository.
+        Grants read and write access (pull and push) to the repository.
       read_registry:
-        Allows read-access (pull) to container registry images if the project is private and authorization is required.
+        Grants read access (pull) to the Container Registry images if a project is private and authorization is required.
       write_registry:
-        Allows write-access (push) to container registry.
+        Grants write access (push) to the Container Registry.
     flash:
       applications:
         create:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 56df8f93113..3c33cdac3f1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -5,6 +5,8 @@ en:
   hello: "Hello world"
   activerecord:
     attributes:
+      incident_management/timeline_event:
+        note: 'Timeline text'
       issue_link:
         source: Source issue
         target: Target issue
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
diff --git a/config/object_store_settings.rb b/config/object_store_settings.rb
index e55032d3987..173ce5a5982 100644
--- a/config/object_store_settings.rb
+++ b/config/object_store_settings.rb
@@ -3,7 +3,7 @@
 # Set default values for object_store settings
 class ObjectStoreSettings
   SUPPORTED_TYPES = %w(artifacts external_diffs lfs uploads packages dependency_proxy terraform_state pages secure_files).freeze
-  ALLOWED_OBJECT_STORE_OVERRIDES = %w(bucket enabled proxy_download).freeze
+  ALLOWED_OBJECT_STORE_OVERRIDES = %w(bucket enabled proxy_download cdn).freeze
 
   # To ensure the one Workhorse credential matches the Rails config, we
   # enforce consolidated settings on those accelerated
diff --git a/config/open_api.yml b/config/open_api.yml
new file mode 100644
index 00000000000..8415a6bff3d
--- /dev/null
+++ b/config/open_api.yml
@@ -0,0 +1,18 @@
+metadata:
+  doc_version: v4
+  info:
+    title: GitLab API
+    termsOfService: https://about.gitlab.com/terms/
+  host: gitlab.com
+  security_definitions:
+    access_token_header:
+      type: apiKey
+      name: PRIVATE-TOKEN
+      in: header
+    access_token_query:
+      type: apiKey
+      name: private_token
+      in: query
+  tags:
+  - name: metadata
+    description: Operations related to metadata of the GitLab instance
diff --git a/config/plugins/monaco_webpack.js b/config/plugins/monaco_webpack.js
deleted file mode 100644
index 01d88ca37db..00000000000
--- a/config/plugins/monaco_webpack.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const { languagesArr } = require('monaco-editor-webpack-plugin/out/languages');
-
-// monaco-yaml library doesn't play so well with monaco-editor-webpack-plugin
-// so the only way to include its workers is by patching the list of languages
-// in monaco-editor-webpack-plugin and adding support for yaml workers. This is
-// a known issue in the library and this workaround was suggested here:
-// https://github.com/pengx17/monaco-yaml/issues/20
-
-const yamlLang = languagesArr.find((t) => t.label === 'yaml');
-
-yamlLang.entry = [yamlLang.entry, '../../monaco-yaml/lib/esm/monaco.contribution'];
-yamlLang.worker = {
-  id: 'vs/language/yaml/yamlWorker',
-  entry: '../../monaco-yaml/lib/esm/yaml.worker.js',
-};
-
-module.exports = require('monaco-editor-webpack-plugin');
diff --git a/config/routes.rb b/config/routes.rb
index 704405bbcbd..28c08e9bbe7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -70,11 +70,6 @@ InitializerConnections.with_disabled_database_connections do
 
       Gitlab.ee do
         resource :company, only: [:new, :create], controller: 'company'
-
-        # legacy - to be removed with https://gitlab.com/gitlab-org/gitlab/-/issues/371996
-        get 'groups/new', to: redirect('users/sign_up/groups_projects/new')
-        get 'projects/new', to: redirect('users/sign_up/groups_projects/new')
-
         resources :groups_projects, only: [:new, :create] do
           collection do
             post :import
@@ -141,28 +136,6 @@ InitializerConnections.with_disabled_database_connections do
 
       get 'runner_setup/platforms' => 'runner_setup#platforms'
 
-      # Boards resources shared between group and projects
-      resources :boards, only: [] do
-        resources :lists, module: :boards, only: [:index, :create, :update, :destroy] do
-          collection do
-            post :generate
-          end
-
-          resources :issues, only: [:index, :create, :update]
-        end
-
-        resources :issues, module: :boards, only: [:index, :update] do
-          collection do
-            put :bulk_move, format: :json
-          end
-        end
-
-        Gitlab.ee do
-          resources :users, module: :boards, only: [:index]
-          resources :milestones, module: :boards, only: [:index]
-        end
-      end
-
       get 'acme-challenge/' => 'acme_challenges#show'
 
       scope :ide, as: :ide, format: false do
diff --git a/config/routes/import.rb b/config/routes/import.rb
index 228c5776197..004839d22a7 100644
--- a/config/routes/import.rb
+++ b/config/routes/import.rb
@@ -23,6 +23,7 @@ namespace :import do
     get :status
     get :callback
     get :realtime_changes
+    post :cancel
   end
 
   resource :gitea, only: [:create, :new], controller: :gitea do
@@ -68,6 +69,10 @@ namespace :import do
     post :authorize
   end
 
+  resource :github_group, only: [] do
+    get :status
+  end
+
   resource :bulk_imports, only: [:create] do
     post :configure
     get :status
diff --git a/config/routes/jira_connect.rb b/config/routes/jira_connect.rb
index 202d2574ad0..f45f524935a 100644
--- a/config/routes/jira_connect.rb
+++ b/config/routes/jira_connect.rb
@@ -14,6 +14,7 @@ namespace :jira_connect do
 
   resources :subscriptions, only: [:index, :create, :destroy]
   resources :branches, only: [:new]
+  resources :public_keys, only: :show
 
   resources :installations, only: [:index] do
     collection do
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 79ca13e3d8c..cd9315ba2aa 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -223,11 +223,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        resources :boards, only: [:index, :show, :create, :update, :destroy], constraints: { id: /\d+/ } do
-          collection do
-            get :recent
-          end
-        end
+        resources :boards, only: [:index, :show], constraints: { id: /\d+/ }
 
         get 'releases/permalink/latest(/)(*suffix_path)', to: 'releases#latest_permalink', as: :latest_release_permalink, format: false
 
@@ -368,6 +364,14 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
 
         resources :incidents, only: [:index]
 
+        namespace :incident_management do
+          resources :timeline_events, only: [] do
+            collection do
+              post :preview_markdown
+            end
+          end
+        end
+
         get 'issues/incident/:id' => 'incidents#show', as: :issues_incident
 
         namespace :error_tracking do
diff --git a/config/routes/user.rb b/config/routes/user.rb
index a9e0d7df88f..0c1bc1956a9 100644
--- a/config/routes/user.rb
+++ b/config/routes/user.rb
@@ -64,7 +64,6 @@ scope '-/users', module: :users do
   end
 
   resources :callouts, only: [:create]
-  resources :namespace_callouts, only: [:create]
   resources :group_callouts, only: [:create]
   resources :project_callouts, only: [:create]
 end
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 4527efe5a1c..eff83e3f3c4 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -93,6 +93,8 @@
   - 1
 - - ci_job_artifacts_expire_project_build_artifacts
   - 1
+- - ci_parse_secure_file_metadata
+  - 1
 - - ci_runners_process_runner_version_update
   - 1
 - - ci_upstream_projects_subscriptions_cleanup
@@ -103,6 +105,8 @@
   - 1
 - - compliance_management_merge_requests_compliance_violations
   - 1
+- - compliance_management_update_default_framework
+  - 1
 - - container_repository
   - 1
 - - create_commit_signature
@@ -175,8 +179,6 @@
   - 1
 - - error_tracking_issue_link
   - 1
-- - experiments_record_conversion_event
-  - 1
 - - export_csv
   - 1
 - - external_service_reactive_caching
@@ -319,14 +321,6 @@
   - 1
 - - migrate_external_diffs
   - 1
-- - namespaces_onboarding_issue_created
-  - 1
-- - namespaces_onboarding_pipeline_created
-  - 1
-- - namespaces_onboarding_progress
-  - 1
-- - namespaces_onboarding_user_added
-  - 1
 - - namespaces_process_sync_events
   - 1
 - - namespaces_sync_namespace_name
@@ -347,6 +341,14 @@
   - 1
 - - onboarding_create_learn_gitlab
   - 1
+- - onboarding_issue_created
+  - 1
+- - onboarding_pipeline_created
+  - 1
+- - onboarding_progress
+  - 1
+- - onboarding_user_added
+  - 1
 - - package_cleanup
   - 1
 - - package_repositories
@@ -379,6 +381,8 @@
   - 5
 - - process_commit
   - 3
+- - product_analytics_initialize_analytics
+  - 1
 - - project_cache
   - 1
 - - project_destroy
@@ -405,6 +409,8 @@
   - 1
 - - projects_refresh_build_artifacts_size_statistics
   - 1
+- - projects_register_suggested_reviewers_project
+  - 1
 - - projects_schedule_bulk_repository_shard_moves
   - 1
 - - projects_update_repository_storage
@@ -449,12 +455,14 @@
   - 1
 - - security_auto_fix
   - 1
-- - security_findings_delete_by_job_id
-  - 1
 - - security_orchestration_policy_rule_schedule_namespace
   - 1
+- - security_process_scan_result_policy
+  - 1
 - - security_scans
   - 2
+- - security_scans_purge_by_job_id
+  - 1
 - - security_sync_scan_policies
   - 1
 - - self_monitoring_project_create
@@ -495,6 +503,8 @@
   - 1
 - - upload_checksum
   - 1
+- - vulnerabilities_mark_dropped_as_resolved
+  - 1
 - - vulnerabilities_statistics_adjustment
   - 1
 - - vulnerability_exports_export
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 146e9b48442..05523952769 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -16,17 +16,20 @@ const VueLoaderPlugin = require('vue-loader/lib/plugin');
 const VUE_LOADER_VERSION = require('vue-loader/package.json').version;
 const VUE_VERSION = require('vue/package.json').version;
 
+const { ESBuildMinifyPlugin } = require('esbuild-loader');
+
 const webpack = require('webpack');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 const { StatsWriterPlugin } = require('webpack-stats-plugin');
 const WEBPACK_VERSION = require('webpack/package.json').version;
+const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
+const esbuildConfiguration = require('./esbuild.config');
 
 const createIncrementalWebpackCompiler = require('./helpers/incremental_webpack_compiler');
 const IS_EE = require('./helpers/is_ee_env');
 const IS_JH = require('./helpers/is_jh_env');
 const vendorDllHash = require('./helpers/vendor_dll_hash');
 
-const MonacoWebpackPlugin = require('./plugins/monaco_webpack');
 const GraphqlKnownOperationsPlugin = require('./plugins/graphql_known_operations_plugin');
 
 const ROOT_PATH = path.resolve(__dirname, '..');
@@ -40,6 +43,8 @@ const VENDOR_DLL = process.env.WEBPACK_VENDOR_DLL && process.env.WEBPACK_VENDOR_
 const CACHE_PATH = process.env.WEBPACK_CACHE_PATH || path.join(ROOT_PATH, 'tmp/cache');
 const IS_PRODUCTION = process.env.NODE_ENV === 'production';
 const IS_DEV_SERVER = process.env.WEBPACK_SERVE === 'true';
+const WEBPACK_USE_ESBUILD_LOADER =
+  process.env.WEBPACK_USE_ESBUILD_LOADER && process.env.WEBPACK_USE_ESBUILD_LOADER !== 'false';
 
 const { DEV_SERVER_HOST, DEV_SERVER_PUBLIC_ADDR } = process.env;
 const DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10);
@@ -49,9 +54,11 @@ const DEV_SERVER_LIVERELOAD = IS_DEV_SERVER && process.env.DEV_SERVER_LIVERELOAD
 const INCREMENTAL_COMPILER_ENABLED =
   IS_DEV_SERVER &&
   process.env.DEV_SERVER_INCREMENTAL &&
-  process.env.DEV_SERVER_INCREMENTAL !== 'false';
+  process.env.DEV_SERVER_INCREMENTAL !== 'false' &&
+  !WEBPACK_USE_ESBUILD_LOADER;
 const INCREMENTAL_COMPILER_TTL = Number(process.env.DEV_SERVER_INCREMENTAL_TTL) || Infinity;
-const INCREMENTAL_COMPILER_RECORD_HISTORY = IS_DEV_SERVER && !process.env.CI;
+const INCREMENTAL_COMPILER_RECORD_HISTORY =
+  IS_DEV_SERVER && !process.env.CI && !WEBPACK_USE_ESBUILD_LOADER;
 const WEBPACK_REPORT = process.env.WEBPACK_REPORT && process.env.WEBPACK_REPORT !== 'false';
 const WEBPACK_MEMORY_TEST =
   process.env.WEBPACK_MEMORY_TEST && process.env.WEBPACK_MEMORY_TEST !== 'false';
@@ -250,6 +257,24 @@ if (VENDOR_DLL && !IS_PRODUCTION) {
   };
 }
 
+const defaultJsOptions = {
+  cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
+  cacheIdentifier: [
+    process.env.BABEL_ENV || process.env.NODE_ENV || 'development',
+    webpack.version,
+    BABEL_VERSION,
+    BABEL_LOADER_VERSION,
+    // Ensure that changing supported browsers will refresh the cache
+    // in order to not pull in outdated files that import core-js
+    SUPPORTED_BROWSERS_HASH,
+  ].join('|'),
+  cacheCompression: false,
+};
+
+if (WEBPACK_USE_ESBUILD_LOADER) {
+  console.log('esbuild-loader is active');
+}
+
 module.exports = {
   mode: IS_PRODUCTION ? 'production' : 'development',
 
@@ -280,23 +305,39 @@ module.exports = {
         test: /\.mjs$/,
         use: [],
       },
-      {
+      WEBPACK_USE_ESBUILD_LOADER && {
         test: /\.js$/,
         exclude: (modulePath) =>
           /node_modules|vendor[\\/]assets/.test(modulePath) && !/\.vue\.js/.test(modulePath),
+        loader: 'esbuild-loader',
+        options: esbuildConfiguration,
+      },
+      !WEBPACK_USE_ESBUILD_LOADER && {
+        test: /\.js$/,
+        exclude: (modulePath) =>
+          /node_modules|vendor[\\/]assets/.test(modulePath) && !/\.vue\.js/.test(modulePath),
+        loader: 'babel-loader',
+        options: defaultJsOptions,
+      },
+      WEBPACK_USE_ESBUILD_LOADER && {
+        test: /\.js$/,
+        include: (modulePath) =>
+          /node_modules\/(monaco-worker-manager|monaco-marker-data-provider)\/index\.js/.test(
+            modulePath,
+          ) || /node_modules\/yaml/.test(modulePath),
+        loader: 'esbuild-loader',
+        options: esbuildConfiguration,
+      },
+      !WEBPACK_USE_ESBUILD_LOADER && {
+        test: /\.js$/,
+        include: (modulePath) =>
+          /node_modules\/(monaco-worker-manager|monaco-marker-data-provider)\/index\.js/.test(
+            modulePath,
+          ) || /node_modules\/yaml/.test(modulePath),
         loader: 'babel-loader',
         options: {
-          cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
-          cacheIdentifier: [
-            process.env.BABEL_ENV || process.env.NODE_ENV || 'development',
-            webpack.version,
-            BABEL_VERSION,
-            BABEL_LOADER_VERSION,
-            // Ensure that changing supported browsers will refresh the cache
-            // in order to not pull in outdated files that import core-js
-            SUPPORTED_BROWSERS_HASH,
-          ].join('|'),
-          cacheCompression: false,
+          plugins: ['@babel/plugin-proposal-numeric-separator'],
+          ...defaultJsOptions,
         },
       },
       {
@@ -389,7 +430,7 @@ module.exports = {
         test: /\.(yml|yaml)$/,
         loader: 'raw-loader',
       },
-    ],
+    ].filter(Boolean),
   },
 
   optimization: {
@@ -460,6 +501,9 @@ module.exports = {
         },
       },
     },
+    ...(WEBPACK_USE_ESBUILD_LOADER
+      ? { minimizer: [new ESBuildMinifyPlugin(esbuildConfiguration)] }
+      : {}),
   },
 
   plugins: [
@@ -492,6 +536,16 @@ module.exports = {
     // automatically configure monaco editor web workers
     new MonacoWebpackPlugin({
       filename: '[name].[contenthash:8].worker.js',
+      customLanguages: [
+        {
+          label: 'yaml',
+          entry: 'monaco-yaml',
+          worker: {
+            id: 'monaco-yaml/yamlWorker',
+            entry: 'monaco-yaml/yaml.worker',
+          },
+        },
+      ],
     }),
 
     new GraphqlKnownOperationsPlugin({ filename: 'graphql_known_operations.yml' }),
@@ -592,7 +646,11 @@ module.exports = {
       patterns: [
         {
           from: path.join(ROOT_PATH, 'node_modules/pdfjs-dist/cmaps/'),
-          to: path.join(WEBPACK_OUTPUT_PATH, 'cmaps/'),
+          to: path.join(WEBPACK_OUTPUT_PATH, 'pdfjs/cmaps/'),
+        },
+        {
+          from: path.join(ROOT_PATH, 'node_modules/pdfjs-dist/legacy/build/pdf.worker.min.js'),
+          to: path.join(WEBPACK_OUTPUT_PATH, 'pdfjs/'),
         },
         {
           from: path.join(ROOT_PATH, 'node_modules', SOURCEGRAPH_PACKAGE, '/'),
diff --git a/config/webpack.vendor.config.js b/config/webpack.vendor.config.js
index 903607679a4..1300bf16e56 100644
--- a/config/webpack.vendor.config.js
+++ b/config/webpack.vendor.config.js
@@ -26,8 +26,6 @@ module.exports = {
   entry: {
     vendor: [
       'jquery/dist/jquery.slim.js',
-      'pdfjs-dist/build/pdf',
-      'pdfjs-dist/build/pdf.worker.min',
       'core-js',
       'echarts',
       'lodash',
@@ -79,6 +77,8 @@ module.exports = {
           https://gitlab.com/gitlab-org/gitlab/-/issues/219353
           */
           'chokidar',
+          // We are ignoring esbuild as we want to force a newer version than what esbuild-loader provides
+          'esbuild',
           // We are ignoring ts-jest, because we force a newer version, compatible with our current jest version
           'ts-jest',
         ].join('|'),