diff --git a/.rubocop.yml b/.rubocop.yml
index 9a99341045c..3e5bdb8ee2b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1023,7 +1023,7 @@ Performance/ActiveRecordSubtransactionMethods:
     - 'spec/**/*.rb'
     - 'ee/spec/**/*.rb'
 
-Migration/BackgroundMigrationBaseClass:
+Migration/BatchedMigrationBaseClass:
   Enabled: false
 
 BackgroundMigration/AvoidSilentRescueExceptions:
diff --git a/.rubocop_todo/migration/background_migration_base_class.yml b/.rubocop_todo/migration/batched_migration_base_class.yml
similarity index 98%
rename from .rubocop_todo/migration/background_migration_base_class.yml
rename to .rubocop_todo/migration/batched_migration_base_class.yml
index 1a0de4e5821..5f3b072c051 100644
--- a/.rubocop_todo/migration/background_migration_base_class.yml
+++ b/.rubocop_todo/migration/batched_migration_base_class.yml
@@ -1,5 +1,5 @@
 ---
-Migration/BackgroundMigrationBaseClass:
+Migration/BatchedMigrationBaseClass:
   Exclude:
     - 'lib/gitlab/background_migration/backfill_draft_status_on_merge_requests.rb'
     - 'lib/gitlab/background_migration/backfill_integrations_enable_ssl_verification.rb'
diff --git a/.rubocop_todo/rspec/before_all_role_assignment.yml b/.rubocop_todo/rspec/before_all_role_assignment.yml
index 22672916fcf..7d66d4342cc 100644
--- a/.rubocop_todo/rspec/before_all_role_assignment.yml
+++ b/.rubocop_todo/rspec/before_all_role_assignment.yml
@@ -793,6 +793,7 @@ RSpec/BeforeAllRoleAssignment:
     - 'spec/features/dashboard/issues_filter_spec.rb'
     - 'spec/features/dashboard/todos/todos_spec.rb'
     - 'spec/features/emails/issues_spec.rb'
+    - 'spec/features/explore/groups_list_spec.rb'
     - 'spec/features/global_search_spec.rb'
     - 'spec/features/groups/board_spec.rb'
     - 'spec/features/groups/dependency_proxy_for_containers_spec.rb'
diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml
index 3481b919e7f..6dc36855f62 100644
--- a/.rubocop_todo/rspec/feature_category.yml
+++ b/.rubocop_todo/rspec/feature_category.yml
@@ -4829,7 +4829,6 @@ RSpec/FeatureCategory:
     - 'spec/rubocop/cop/migration/add_index_spec.rb'
     - 'spec/rubocop/cop/migration/add_reference_spec.rb'
     - 'spec/rubocop/cop/migration/add_timestamps_spec.rb'
-    - 'spec/rubocop/cop/migration/background_migration_base_class_spec.rb'
     - 'spec/rubocop/cop/migration/background_migration_missing_active_concern_spec.rb'
     - 'spec/rubocop/cop/migration/background_migration_record_spec.rb'
     - 'spec/rubocop/cop/migration/background_migrations_spec.rb'
diff --git a/app/assets/javascripts/ci/catalog/components/details/ci_resource_header_skeleton_loader.vue b/app/assets/javascripts/ci/catalog/components/details/ci_resource_header_skeleton_loader.vue
index 83ea224d772..8f3510e4487 100644
--- a/app/assets/javascripts/ci/catalog/components/details/ci_resource_header_skeleton_loader.vue
+++ b/app/assets/javascripts/ci/catalog/components/details/ci_resource_header_skeleton_loader.vue
@@ -5,7 +5,7 @@ export default {};
 <template>
   <div class="gl-display-flex">
     <div class="gl-animate-skeleton-loader gl-h-11 gl-rounded-base gl-w-11"></div>
-    <div class="gl-pl-4 gl--flex-center gl-flex-direction-column">
+    <div class="gl-pl-4 gl-flex gl-justify-center gl-items-center gl-flex-direction-column">
       <div class="gl-animate-skeleton-loader gl-h-4 gl-rounded-base gl-mb-3 gl-w-20"></div>
       <div class="gl-animate-skeleton-loader gl-h-4 gl-rounded-base gl-w-20"></div>
     </div>
diff --git a/app/assets/javascripts/diffs/components/diff_content.vue b/app/assets/javascripts/diffs/components/diff_content.vue
index 112112f3980..cf7f45d044c 100644
--- a/app/assets/javascripts/diffs/components/diff_content.vue
+++ b/app/assets/javascripts/diffs/components/diff_content.vue
@@ -178,7 +178,7 @@ export default {
       </template>
       <div
         v-else-if="isWhitespaceOnly"
-        class="gl-bg-gray-10 gl--flex-center gl-h-13"
+        class="gl-bg-gray-10 gl-flex gl-justify-center gl-items-center gl-h-13"
         data-testid="diff-whitespace-only-state"
       >
         {{ __('Contains only whitespace changes.') }}
diff --git a/app/assets/javascripts/environments/environment_details/pagination.vue b/app/assets/javascripts/environments/environment_details/pagination.vue
index 86f21914305..16511731288 100644
--- a/app/assets/javascripts/environments/environment_details/pagination.vue
+++ b/app/assets/javascripts/environments/environment_details/pagination.vue
@@ -59,7 +59,7 @@ export default {
 };
 </script>
 <template>
-  <div v-if="isPaginationVisible" class="gl--flex-center">
+  <div v-if="isPaginationVisible" class="gl-flex gl-justify-center gl-items-center">
     <gl-keyset-pagination
       v-bind="pageInfo"
       :prev-button-link="previousLink"
diff --git a/app/assets/javascripts/groups/components/empty_states/groups_explore_empty_state.vue b/app/assets/javascripts/groups/components/empty_states/groups_explore_empty_state.vue
index bf95288a155..13f68e96cd8 100644
--- a/app/assets/javascripts/groups/components/empty_states/groups_explore_empty_state.vue
+++ b/app/assets/javascripts/groups/components/empty_states/groups_explore_empty_state.vue
@@ -8,9 +8,7 @@ export default {
   inject: ['groupsEmptyStateIllustration'],
   computed: {
     title() {
-      return window.gon?.dot_com
-        ? s__('GroupsEmptyState|No public groups')
-        : s__('GroupsEmptyState|No public or internal groups');
+      return s__('GroupsEmptyState|No public or internal groups');
     },
   },
 };
diff --git a/app/assets/javascripts/ide/lib/gitlab_web_ide/setup_root_element.js b/app/assets/javascripts/ide/lib/gitlab_web_ide/setup_root_element.js
index b0e06c88d26..fab4d8bcb99 100644
--- a/app/assets/javascripts/ide/lib/gitlab_web_ide/setup_root_element.js
+++ b/app/assets/javascripts/ide/lib/gitlab_web_ide/setup_root_element.js
@@ -7,7 +7,13 @@
 export const setupRootElement = (el) => {
   const newEl = document.createElement(el.tagName);
   newEl.id = el.id;
-  newEl.classList.add('gl--flex-center', 'gl-relative', 'gl-h-full');
+  newEl.classList.add(
+    'gl-flex',
+    'gl-justify-center',
+    'gl-items-center',
+    'gl-relative',
+    'gl-h-full',
+  );
   el.replaceWith(newEl);
 
   return newEl;
diff --git a/app/assets/javascripts/issues/show/components/incidents/timeline_events_item.vue b/app/assets/javascripts/issues/show/components/incidents/timeline_events_item.vue
index 5026bb7e4d5..d1a7c933a5e 100644
--- a/app/assets/javascripts/issues/show/components/incidents/timeline_events_item.vue
+++ b/app/assets/javascripts/issues/show/components/incidents/timeline_events_item.vue
@@ -72,7 +72,7 @@ export default {
 <template>
   <div class="timeline-event gl-display-grid">
     <div
-      class="timeline-event-icon gl--flex-center gl-bg-white gl-text-gray-200 gl-border gl-rounded-full gl-mt-2 gl-w-8 gl-h-8 gl-p-3 gl-z-1"
+      class="timeline-event-icon gl-flex gl-justify-center gl-items-center gl-bg-white gl-text-gray-200 gl-border gl-rounded-full gl-mt-2 gl-w-8 gl-h-8 gl-p-3 gl-z-1"
     >
       <gl-icon :name="getEventIcon(action)" class="note-icon" />
     </div>
diff --git a/app/assets/javascripts/notes/components/discussion_filter_note.vue b/app/assets/javascripts/notes/components/discussion_filter_note.vue
index dff97e05bb5..9b838571d2c 100644
--- a/app/assets/javascripts/notes/components/discussion_filter_note.vue
+++ b/app/assets/javascripts/notes/components/discussion_filter_note.vue
@@ -29,7 +29,7 @@ export default {
     data-testid="discussion-filter-container"
   >
     <div
-      class="gl-float-left gl--flex-center gl-rounded-full -gl-mt-1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600"
+      class="gl-float-left gl-flex gl-justify-center gl-items-center gl-rounded-full -gl-mt-1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600"
     >
       <gl-icon name="comment" />
     </div>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/widget/status_icon.vue b/app/assets/javascripts/vue_merge_request_widget/components/widget/status_icon.vue
index 1ecc34423eb..f203a37505c 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/widget/status_icon.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/widget/status_icon.vue
@@ -48,7 +48,7 @@ export default {
     :class="{
       [iconClassNameText]: !isLoading,
       [`mr-widget-status-icon-level-${level}`]: !isLoading,
-      'gl-w-6 gl-h-6 gl--flex-center': level === 1,
+      'gl-w-6 gl-h-6 gl-flex gl-justify-center gl-items-center': level === 1,
     }"
     class="gl-relative gl-rounded-full gl-mr-3"
   >
diff --git a/app/assets/javascripts/vue_shared/components/incubation/pagination.vue b/app/assets/javascripts/vue_shared/components/incubation/pagination.vue
index 20e53f3f42b..a002cf31a23 100644
--- a/app/assets/javascripts/vue_shared/components/incubation/pagination.vue
+++ b/app/assets/javascripts/vue_shared/components/incubation/pagination.vue
@@ -42,7 +42,7 @@ export default {
 </script>
 
 <template>
-  <div v-if="isPaginationVisible" class="gl--flex-center">
+  <div v-if="isPaginationVisible" class="gl-flex gl-justify-center gl-items-center">
     <gl-keyset-pagination
       :start-cursor="startCursor"
       :end-cursor="endCursor"
diff --git a/app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue b/app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue
index 4d2760ade1b..a2a3cc6f09e 100644
--- a/app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue
+++ b/app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue
@@ -14,7 +14,7 @@ export default {
 <template>
   <timeline-entry-item class="note note-wrapper">
     <div
-      class="gl-float-left gl--flex-center gl-rounded-full -gl-mt-1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600"
+      class="gl-float-left gl-flex gl-justify-center gl-items-center gl-rounded-full -gl-mt-1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600"
     ></div>
     <div class="timeline-content">
       <div class="note-header"></div>
diff --git a/app/assets/javascripts/vue_shared/components/notes/system_note.vue b/app/assets/javascripts/vue_shared/components/notes/system_note.vue
index 761cbe427d5..5a5d255fc59 100644
--- a/app/assets/javascripts/vue_shared/components/notes/system_note.vue
+++ b/app/assets/javascripts/vue_shared/components/notes/system_note.vue
@@ -152,7 +152,7 @@ export default {
           'system-note-tiny-dot gl-bg-gray-900!': !isAllowedIcon,
         },
       ]"
-      class="gl-float-left gl--flex-center gl-rounded-full gl-relative timeline-icon"
+      class="gl-float-left gl-flex gl-justify-center gl-items-center gl-rounded-full gl-relative timeline-icon"
     >
       <gl-icon
         v-if="isAllowedIcon"
diff --git a/app/assets/javascripts/vue_shared/components/notes/timeline_icon.vue b/app/assets/javascripts/vue_shared/components/notes/timeline_icon.vue
index 25cbe3cb033..01eb29b8c48 100644
--- a/app/assets/javascripts/vue_shared/components/notes/timeline_icon.vue
+++ b/app/assets/javascripts/vue_shared/components/notes/timeline_icon.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="gl-float-left gl--flex-center gl-rounded-full -gl-mt-1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600"
+    class="gl-float-left gl-flex gl-justify-center gl-items-center gl-rounded-full -gl-mt-1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600"
   >
     <slot></slot>
   </div>
diff --git a/app/assets/javascripts/vue_shared/components/registry/history_item.vue b/app/assets/javascripts/vue_shared/components/registry/history_item.vue
index 0bf3d396a39..991e06d0ad4 100644
--- a/app/assets/javascripts/vue_shared/components/registry/history_item.vue
+++ b/app/assets/javascripts/vue_shared/components/registry/history_item.vue
@@ -20,7 +20,7 @@ export default {
 <template>
   <timeline-entry-item class="system-note note-wrapper">
     <div
-      class="gl--flex-center gl-rounded-full -gl-mt-1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600 gl-float-left"
+      class="gl-flex gl-justify-center gl-items-center gl-rounded-full -gl-mt-1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600 gl-float-left"
     >
       <gl-icon :name="icon" />
     </div>
diff --git a/app/assets/javascripts/work_items/components/notes/system_note.vue b/app/assets/javascripts/work_items/components/notes/system_note.vue
index 21c337e67c0..d7a4f2906fc 100644
--- a/app/assets/javascripts/work_items/components/notes/system_note.vue
+++ b/app/assets/javascripts/work_items/components/notes/system_note.vue
@@ -120,7 +120,7 @@ export default {
           'system-note-tiny-dot gl-bg-gray-900!': !isAllowedIcon,
         },
       ]"
-      class="gl-float-left gl--flex-center gl-rounded-full gl-relative"
+      class="gl-float-left gl-flex gl-justify-center gl-items-center gl-rounded-full gl-relative"
     >
       <gl-icon v-if="isAllowedIcon" :size="12" :name="note.systemNoteIconName" />
     </div>
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_history_only_filter_note.vue b/app/assets/javascripts/work_items/components/notes/work_item_history_only_filter_note.vue
index 29d28c6233b..39ce15645cf 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_history_only_filter_note.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_history_only_filter_note.vue
@@ -31,7 +31,7 @@ export default {
 <template>
   <li class="timeline-entry note note-wrapper discussion-filter-note">
     <div
-      class="gl-float-left gl--flex-center gl-rounded-full -gl-mt-1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600"
+      class="gl-float-left gl-flex gl-justify-center gl-items-center gl-rounded-full -gl-mt-1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600"
     >
       <gl-icon name="comment" />
     </div>
diff --git a/app/assets/javascripts/work_items/components/work_item_description_rendered.vue b/app/assets/javascripts/work_items/components/work_item_description_rendered.vue
index 10bae2daed6..ecb7fc73d8f 100644
--- a/app/assets/javascripts/work_items/components/work_item_description_rendered.vue
+++ b/app/assets/javascripts/work_items/components/work_item_description_rendered.vue
@@ -141,7 +141,7 @@ export default {
         class="description-more gl-display-block gl-w-full"
         data-test-id="description-read-more"
       >
-        <div class="show-all-btn gl-w-full gl--flex-center">
+        <div class="show-all-btn gl-w-full gl-flex gl-justify-center gl-items-center">
           <gl-button
             variant="confirm"
             category="tertiary"
diff --git a/app/assets/stylesheets/framework/secondary_navigation_elements.scss b/app/assets/stylesheets/framework/secondary_navigation_elements.scss
index 91096bf41c9..234248435b6 100644
--- a/app/assets/stylesheets/framework/secondary_navigation_elements.scss
+++ b/app/assets/stylesheets/framework/secondary_navigation_elements.scss
@@ -102,6 +102,7 @@
     > .btn-group,
     > .btn-container,
     > .dropdown,
+    > .gl-new-dropdown,
     > input,
     > form {
       margin-right: $gl-padding-8;
@@ -142,6 +143,7 @@
       .btn,
       form,
       .dropdown,
+      .gl-new-dropdown,
       .dropdown-toggle,
       .dropdown-menu-toggle,
       .form-control,
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index fb0e4983c4e..1a4fca6bc27 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -1122,7 +1122,9 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio;
   position: relative;
 
   .system-note-image {
-    @include gl--flex-center;
+    @apply gl-flex;
+    @apply gl-justify-center;
+    @apply gl-items-center;
     top: 14px;
     width: 22px;
     height: 22px;
diff --git a/app/controllers/concerns/group_tree.rb b/app/controllers/concerns/group_tree.rb
index e02a766d2b9..e74f64ee81d 100644
--- a/app/controllers/concerns/group_tree.rb
+++ b/app/controllers/concerns/group_tree.rb
@@ -8,9 +8,11 @@ module GroupTree
 
     groups = if params[:filter].present?
                filtered_groups_with_ancestors(groups)
+             elsif params[:parent_id].present?
+               groups.where(parent_id: params[:parent_id]).page(params[:page])
              else
                # If `params[:parent_id]` is `nil`, we will only show root-groups
-               groups.where(parent_id: params[:parent_id]).page(params[:page])
+               groups.by_parent(nil).page(params[:page])
              end
 
     @groups = groups.with_selects_for_list(archived: params[:archived])
diff --git a/app/controllers/explore/groups_controller.rb b/app/controllers/explore/groups_controller.rb
index 6cb0736d7ef..f0091420564 100644
--- a/app/controllers/explore/groups_controller.rb
+++ b/app/controllers/explore/groups_controller.rb
@@ -6,14 +6,9 @@ class Explore::GroupsController < Explore::ApplicationController
   feature_category :groups_and_projects
   urgency :low
 
-  def index
-    # For gitlab.com, including internal visibility groups here causes
-    # a major performance issue: https://gitlab.com/gitlab-org/gitlab/-/issues/358944
-    #
-    # For self-hosted users, not including internal groups here causes
-    # a lack of visibility: https://gitlab.com/gitlab-org/gitlab/-/issues/389041
-    user = Gitlab.com? ? nil : current_user
+  MAX_QUERY_SIZE = 10_000
 
-    render_group_tree GroupsFinder.new(user).execute
+  def index
+    render_group_tree GroupsFinder.new(current_user).execute.limit(MAX_QUERY_SIZE)
   end
 end
diff --git a/app/models/ci/daily_build_group_report_result.rb b/app/models/ci/daily_build_group_report_result.rb
index d596bd67e66..aa7232c2c43 100644
--- a/app/models/ci/daily_build_group_report_result.rb
+++ b/app/models/ci/daily_build_group_report_result.rb
@@ -3,6 +3,9 @@
 module Ci
   class DailyBuildGroupReportResult < Ci::ApplicationRecord
     include Ci::Partitionable
+    include SafelyChangeColumnDefault
+
+    columns_changing_default :partition_id
 
     PARAM_TYPES = %w[coverage].freeze
 
diff --git a/app/policies/packages/policies/dependency_proxy/group_policy.rb b/app/policies/packages/policies/dependency_proxy/group_policy.rb
index 11e57a2d337..b0aed7dfcaf 100644
--- a/app/policies/packages/policies/dependency_proxy/group_policy.rb
+++ b/app/policies/packages/policies/dependency_proxy/group_policy.rb
@@ -10,6 +10,9 @@
 # - a Group DeployToken
 #
 # We use this custom policy class for JWT requests
+#
+# TODO: Split this into multiple policies, one per supported user type
+# https://gitlab.com/gitlab-org/gitlab/-/issues/463501
 module Packages
   module Policies
     module DependencyProxy
@@ -18,18 +21,14 @@ module Packages
 
         desc "Deploy token with read access to dependency proxy"
         condition(:read_dependency_proxy_deploy_token) do
-          @user.is_a?(DeployToken) && @user&.valid_for_dependency_proxy? && @user&.has_access_to_group?(@subject.group)
+          deploy_token_user? && @user&.valid_for_dependency_proxy? && @user&.has_access_to_group?(@subject.group)
         end
 
-        desc "Personal access or group access token with read access to dependency proxy"
+        # TODO: Remove the deploy token check when we create a deploy token policy
+        # https://gitlab.com/gitlab-org/gitlab/-/issues/463501
+        desc "Non deploy token with read access to dependency proxy"
         condition(:read_dependency_proxy_personal_access_token) do
-          user_is_personal_access_token? &&
-            (
-              user.user.human? ||
-              user.user.service_account? ||
-              (user.user.project_bot? && user.user.resource_bot_resource.is_a?(::Group))
-            ) &&
-            (access_level(for_any_session: true) >= GroupMember::GUEST)
+          !deploy_token_user? && (access_level(for_any_session: true) >= GroupMember::GUEST)
         end
 
         condition(:dependency_proxy_disabled, scope: :subject) do
@@ -56,8 +55,8 @@ module Packages
           @subject.max_member_access_for_user(@user.user)
         end
 
-        def user_is_personal_access_token?
-          user.is_a?(PersonalAccessToken)
+        def deploy_token_user?
+          @user.is_a?(DeployToken)
         end
       end
     end
diff --git a/app/services/ci/daily_build_group_report_result_service.rb b/app/services/ci/daily_build_group_report_result_service.rb
index 25c6d57d961..9555d627373 100644
--- a/app/services/ci/daily_build_group_report_result_service.rb
+++ b/app/services/ci/daily_build_group_report_result_service.rb
@@ -21,7 +21,8 @@ module Ci
         date: pipeline.created_at.to_date,
         last_pipeline_id: pipeline.id,
         default_branch: pipeline.default_branch?,
-        group_id: pipeline.project&.group&.id
+        group_id: pipeline.project&.group&.id,
+        partition_id: pipeline.partition_id
       }
 
       aggregate(pipeline.builds.with_coverage).map do |group_name, group|
diff --git a/app/services/dependency_proxy/auth_token_service.rb b/app/services/dependency_proxy/auth_token_service.rb
index a207ff2f92a..89e9e7712e7 100644
--- a/app/services/dependency_proxy/auth_token_service.rb
+++ b/app/services/dependency_proxy/auth_token_service.rb
@@ -36,10 +36,10 @@ module DependencyProxy
       elsif token_payload['group_access_token']
         # a group access token is a personal access token in disguise
         get_personal_access_token(token_payload['group_access_token'])
-      elsif token_payload['deploy_token']
-        get_deploy_token(token_payload['deploy_token'])
       elsif token_payload['user_id']
         get_user(token_payload['user_id'])
+      elsif token_payload['deploy_token']
+        get_deploy_token(token_payload['deploy_token'])
       end
     rescue JWT::DecodeError, JWT::ExpiredSignature, JWT::ImmatureSignature
       nil
diff --git a/app/services/members/update_service.rb b/app/services/members/update_service.rb
index af2f75998fc..e126f062be1 100644
--- a/app/services/members/update_service.rb
+++ b/app/services/members/update_service.rb
@@ -17,6 +17,9 @@ module Members
       end
 
       prepare_response(members)
+
+    rescue ActiveRecord::RecordInvalid
+      prepare_response(members)
     end
 
     private
@@ -26,8 +29,6 @@ module Members
       Member.transaction do
         members.filter_map { |member| update_member(member, permission) }
       end
-    rescue ActiveRecord::RecordInvalid
-      []
     end
 
     def update_member(member, permission)
@@ -37,6 +38,7 @@ module Members
       return unless member.changed?
 
       member.expiry_notified_at = nil if member.expires_at_changed?
+
       member.tap(&:save!)
     end
 
diff --git a/app/views/explore/groups/index.html.haml b/app/views/explore/groups/index.html.haml
index 3d94552e805..56b8eae8d19 100644
--- a/app/views/explore/groups/index.html.haml
+++ b/app/views/explore/groups/index.html.haml
@@ -8,10 +8,7 @@
   %div
     %h1.page-title.gl-font-size-h-display= page_title
     %p
-      - if Gitlab.com?
-        = _("Below you will find all the groups that are public. Contribute by requesting to join a group.")
-      - else
-        = _("Below you will find all the groups that are public or internal. Contribute by requesting to join a group.")
+      = _("Below you will find all the groups that are public or internal. Contribute by requesting to join a group.")
       #{link_to _('Learn more'), help_page_path('user/group/index', { anchor: 'view-groups' })}.
   .page-title-controls.gl-mt-4
     - if current_user&.can_create_group?
diff --git a/app/views/projects/imports/show.html.haml b/app/views/projects/imports/show.html.haml
index 7f509aee07c..f39eee383bf 100644
--- a/app/views/projects/imports/show.html.haml
+++ b/app/views/projects/imports/show.html.haml
@@ -2,7 +2,7 @@
 
 .save-project-loader
   .center
-    %h2.gl--flex-center.gl-flex-direction-column.gl-sm-flex-direction-row
+    %h2.gl-flex.gl-justify-center.gl-items-center.gl-flex-direction-column.gl-sm-flex-direction-row
       = gl_loading_icon(inline: true)
       %span.gl-ml-3
         = import_in_progress_title
diff --git a/app/views/shared/notes/_note.html.haml b/app/views/shared/notes/_note.html.haml
index 8505c9638a4..07f29848f33 100644
--- a/app/views/shared/notes/_note.html.haml
+++ b/app/views/shared/notes/_note.html.haml
@@ -12,7 +12,7 @@
     note_id: note.id } }
   .timeline-entry-inner
     - if note.system
-      .gl-float-left.gl--flex-center.gl-rounded-full.-gl-mt-1.gl-ml-2.gl-w-6.gl-h-6.gl-bg-gray-50.gl-text-gray-600
+      .gl-float-left.gl-flex.gl-justify-center.gl-items-center.gl-rounded-full.-gl-mt-1.gl-ml-2.gl-w-6.gl-h-6.gl-bg-gray-50.gl-text-gray-600
         = icon_for_system_note(note)
     - else
       .timeline-avatar.gl-float-left
diff --git a/config/feature_flags/gitlab_com_derisk/parse_ci_job_timestamps.yml b/config/feature_flags/gitlab_com_derisk/parse_ci_job_timestamps.yml
new file mode 100644
index 00000000000..d8c8cb9066d
--- /dev/null
+++ b/config/feature_flags/gitlab_com_derisk/parse_ci_job_timestamps.yml
@@ -0,0 +1,9 @@
+---
+name: parse_ci_job_timestamps
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/455581
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154561
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/464785
+milestone: '17.1'
+group: group::runner
+type: gitlab_com_derisk
+default_enabled: false
diff --git a/config/feature_flags/gitlab_com_derisk/rate_limiting_user_endpoints.yml b/config/feature_flags/gitlab_com_derisk/rate_limiting_user_endpoints.yml
new file mode 100644
index 00000000000..2bf9d53351c
--- /dev/null
+++ b/config/feature_flags/gitlab_com_derisk/rate_limiting_user_endpoints.yml
@@ -0,0 +1,8 @@
+---
+name: rate_limiting_user_endpoints
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/150327
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/452349
+milestone: '17.1'
+type: gitlab_com_derisk
+group: group::authentication
+default_enabled: false
diff --git a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
index c00d500f4d5..7a7261bf453 100644
--- a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
+++ b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.analytics.i_analytics_cohorts_monthly
 description: "Unique visitors to /-/instance_statistics/cohorts"
-product_section: fulfillment
-product_stage: fulfillment
 product_group: utilization
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
index 3e92ec05e21..fcc5ca26ceb 100644
--- a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
+++ b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.search.i_search_total_monthly
 description: Calculated unique users to perform Basic or Advanced searches by month
-product_section: enablement
-product_stage: enablement
 product_group: global_search
 value_type: number
 status: active
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 f1107fc6af3..76a1e17f2d5 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
@@ -5,8 +5,6 @@ description: Total unique users for i_search_total, i_search_advanced, i_search_
   for recent 28 days. This metric is redundant because advanced will be a subset of
   paid and paid will be a subset of total. i_search_total is more appropriate if you
   just want the total
-product_section: enablement
-product_stage: enablement
 product_group: global_search
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180816_groups.yml b/config/metrics/counts_28d/20210216180816_groups.yml
index 4c79c9e6268..13f65f9e940 100644
--- a/config/metrics/counts_28d/20210216180816_groups.yml
+++ b/config/metrics/counts_28d/20210216180816_groups.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.groups
 description: Number of users who are group members for last 28 days
-product_section: sec
-product_stage: govern
 product_group: authentication
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180818_users_created.yml b/config/metrics/counts_28d/20210216180818_users_created.yml
index e19048661a2..f5a6de5a850 100644
--- a/config/metrics/counts_28d/20210216180818_users_created.yml
+++ b/config/metrics/counts_28d/20210216180818_users_created.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.users_created
 description: Number of users created in the month
-product_section: sec
-product_stage: govern
 product_group: authentication
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
index d82ee32ee24..5d5f0e9ff4a 100644
--- a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
+++ b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts_monthly.aggregated_metrics.product_analytics_test_metrics_union
 description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
index 4554ece2cec..9aa45bf0a75 100644
--- a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
+++ b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts_monthly.aggregated_metrics.product_analytics_test_metrics_intersection
 description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
index 983dfc8a132..0af7033955d 100644
--- a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
+++ b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.omniauth_providers
 description: List of unique OmniAuth providers
-product_section: sec
-product_stage: govern
 product_group: authentication
 value_type: object
 status: active
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 27afee3150c..cdcc3414053 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
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: search_unique_visits.search_unique_visits_for_any_target_monthly
 description: Removed as duplicate of redis_hll_counters.search.search_total_unique_counts_monthly
-product_section: enablement
-product_stage: enablement
 product_group: global_search
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
index 21527d0cf3b..20d0d43ce51 100644
--- a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.testing.testing_total_unique_counts_monthly
 description: Total users for events under testing category
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
index c7f0363f558..b4dab849bfb 100644
--- a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.secure.users_expanding_secure_security_report_monthly
 description: Count of expanding the security report widget
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
index 2c2cd670a80..864cbdd7035 100644
--- a/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
+++ b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
@@ -1,8 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider
 description: Number of unique user logins using two factor authentication for available providers
-product_section: sec
-product_stage: govern
 product_group: authentication
 value_type: object
 status: active
diff --git a/config/metrics/counts_28d/20210916080405_promoted_issues.yml b/config/metrics/counts_28d/20210916080405_promoted_issues.yml
index cfbc0d2655c..fd96641e9db 100644
--- a/config/metrics/counts_28d/20210916080405_promoted_issues.yml
+++ b/config/metrics/counts_28d/20210916080405_promoted_issues.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts_monthly.promoted_issues
 description: Count of issues promoted to epics
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml
index 65f1eecc7e6..291c4d81ca1 100644
--- a/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_sast_iac_latest_monthly
 description: Count of pipelines using the latest SAST IaC template
-product_section: sec
-product_stage: secure
 product_group: "static_analysis"
 value_type: number
 status: active
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 68db0a93e47..f6e2f234a62 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
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_sast_iac_latest_monthly
 description: Count of pipelines with implicit runs using the latest SAST IaC template
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml
index 33d7a214bf2..91f29b5613c 100644
--- a/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_iac_latest_monthly
 description: Count of pipelines using the latest SAST IaC template
-product_section: sec
-product_stage: secure
 product_group: "static_analysis"
 value_type: number
 status: active
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 a003d211cb5..b9dc9bdfa00 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
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_sast_iac_latest_monthly
 description: Count of pipelines with implicit runs using the latest SAST IaC template
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20211118200530_p_ci_templates_security_dast_on_demand_api_scan_monthly.yml b/config/metrics/counts_28d/20211118200530_p_ci_templates_security_dast_on_demand_api_scan_monthly.yml
index 22e5aa42254..1de00531c52 100644
--- a/config/metrics/counts_28d/20211118200530_p_ci_templates_security_dast_on_demand_api_scan_monthly.yml
+++ b/config/metrics/counts_28d/20211118200530_p_ci_templates_security_dast_on_demand_api_scan_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dast_on_demand_api_scan_monthly
 description: Count of pipelines using the latest DAST API template
-product_section: sec
-product_stage: secure
 product_group: "dynamic_analysis"
 value_type: number
 status: active
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 0cba55aa82e..e6cab27f843 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
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_dast_api_latest_monthly
 description: Monthly counts for DAST API latest CI template
-product_section: sec
-product_stage: secure
 product_group: dynamic_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml b/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml
index 9ae9fde73dd..0564ff1f02c 100644
--- a/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml
+++ b/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.testing.users_expanding_testing_license_compliance_report_monthly
 description: Count of expanding the license compliance widget
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml b/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml
index caf8d67aaa4..2e653bb3710 100644
--- a/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml
+++ b/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.testing.users_visiting_testing_license_compliance_full_report_monthly
 description: Count of visiting the license compliance full report
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20211201194407_p_ci_templates_security_dast_api_latest_monthly.yml b/config/metrics/counts_28d/20211201194407_p_ci_templates_security_dast_api_latest_monthly.yml
index ee6037ab014..0fab9ce5b16 100644
--- a/config/metrics/counts_28d/20211201194407_p_ci_templates_security_dast_api_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211201194407_p_ci_templates_security_dast_api_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dast_api_latest_monthly
 description: Monthly counts for DAST API latest CI template
-product_section: sec
-product_stage: secure
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml b/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml
index 5b2aee71b55..e33ad3925a6 100644
--- a/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml
+++ b/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.testing.users_visiting_testing_manage_license_compliance_monthly
 description: Count of visiting the manage license compliance page
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml b/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml
index 0062b968d45..478d5265c7e 100644
--- a/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml
+++ b/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.testing.users_clicking_license_testing_visiting_external_website_monthly
 description: Count of users clicking licence to visit external information website
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_monthly.yml b/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_monthly.yml
index 82f11d6dcd1..941dfa4b8c2 100644
--- a/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_dependency_scanning_monthly
 description: Monthly counts for implicit use of Dependency Scanning CI template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_monthly.yml b/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_monthly.yml
index b1663d3fdce..716c04faa8c 100644
--- a/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_license_scanning_monthly
 description: Monthly counts for implicit use of License Scanning CI template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_dependency_scanning_monthly.yml b/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_dependency_scanning_monthly.yml
index c1981ac4780..ae3f07fdfd7 100644
--- a/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_dependency_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_dependency_scanning_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_dependency_scanning_monthly
 description: Monthly counts for Dependency Scanning CI template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_license_scanning_monthly.yml b/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_license_scanning_monthly.yml
index e20d4f08c05..ba516e90947 100644
--- a/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_license_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_license_scanning_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_license_scanning_monthly
 description: Monthly counts for License Scanning CI template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml b/config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml
index de4160c1d4e..244f0d4cd6a 100644
--- a/config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_latest_monthly
 description: Weekly counts for SAST CI Latest template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml b/config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml
index 3e51bb0e4aa..0d03fca5f0f 100644
--- a/config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_secret_detection_latest_monthly
 description: Weekly counts for Secret Detection CI Latest template (Security folder)
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: active
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 a29bcda2c6c..67f6f07db9d 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
@@ -2,8 +2,6 @@
 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)
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
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 bd823775451..21deda2b497 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
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_sast_latest_monthly
 description: Weekly counts for implicit use of SAST CI Latest template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml b/config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml
index 60d5c9ac054..1b7b3acfa25 100644
--- a/config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml
+++ b/config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_iac_monthly
 description: Count of pipelines using the stable SAST IaC template
-product_section: sec
-product_stage: secure
 product_group: "static_analysis"
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml b/config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml
index 894da4185b0..845ec46f1d3 100644
--- a/config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml
+++ b/config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_sast_iac_monthly
 description: Count of pipelines using the stable SAST IaC template
-product_section: sec
-product_stage: secure
 product_group: "static_analysis"
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220531145023_p_ci_templates_katalon_monthly.yml b/config/metrics/counts_28d/20220531145023_p_ci_templates_katalon_monthly.yml
index 64913e9645e..3f2838a0580 100644
--- a/config/metrics/counts_28d/20220531145023_p_ci_templates_katalon_monthly.yml
+++ b/config/metrics/counts_28d/20220531145023_p_ci_templates_katalon_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_katalon_monthly
 description: 'Monthly counts of times users have executed katalon_tests jobs'
-product_section: 'ops'
-product_stage: 'analytics'
 product_group: 'pipeline_authoring'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220715195415_p_ci_templates_security_fortify_fod_sast_monthly.yml b/config/metrics/counts_28d/20220715195415_p_ci_templates_security_fortify_fod_sast_monthly.yml
index f1d5a3e795c..3cb13f69e88 100644
--- a/config/metrics/counts_28d/20220715195415_p_ci_templates_security_fortify_fod_sast_monthly.yml
+++ b/config/metrics/counts_28d/20220715195415_p_ci_templates_security_fortify_fod_sast_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_fortify_fod_sast_monthly
 description: Count of pipelines using the Fortify FoD SAST template
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: active
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 4a8d58800d3..405af4472e7 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
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_fortify_fod_sast_monthly
 description: Count of pipelines with implicit runs using the Fortify FoD SAST template
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20220825232557_count_user_auth.yml b/config/metrics/counts_28d/20220825232557_count_user_auth.yml
index 625973f9851..4b94a5ca860 100644
--- a/config/metrics/counts_28d/20220825232557_count_user_auth.yml
+++ b/config/metrics/counts_28d/20220825232557_count_user_auth.yml
@@ -1,8 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.count_user_auth
 description: Number of unique user logins
-product_section: sec
-product_stage: govern
 product_group: authentication
 value_type: number
 status: active
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 bdcf97602db..25f025f8498 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
@@ -2,8 +2,6 @@
 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
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
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 1f579aade8b..bfce07edbc3 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
@@ -2,8 +2,6 @@
 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
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20220907202807_p_ci_templates_jobs_dependency_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220907202807_p_ci_templates_jobs_dependency_scanning_latest_monthly.yml
index ae659173c27..916c984bf69 100644
--- a/config/metrics/counts_28d/20220907202807_p_ci_templates_jobs_dependency_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220907202807_p_ci_templates_jobs_dependency_scanning_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_dependency_scanning_latest_monthly
 description: Monthly counts for Dependency Scanning CI Latest template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220907212005_p_ci_templates_security_container_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220907212005_p_ci_templates_security_container_scanning_latest_monthly.yml
index c5728388138..ff25f466504 100644
--- a/config/metrics/counts_28d/20220907212005_p_ci_templates_security_container_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220907212005_p_ci_templates_security_container_scanning_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_container_scanning_latest_monthly
 description: Monthly counts for Container Scanning CI Latest template (Security folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220907215635_p_ci_templates_jobs_license_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220907215635_p_ci_templates_jobs_license_scanning_latest_monthly.yml
index 21d64a706de..c051f9dbb99 100644
--- a/config/metrics/counts_28d/20220907215635_p_ci_templates_jobs_license_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220907215635_p_ci_templates_jobs_license_scanning_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_license_scanning_latest_monthly
 description: Monthly counts for License Scanning CI Latest template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
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 230870b2fc5..599eff91e52 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
@@ -2,8 +2,6 @@
 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)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: removed
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 5c5afa10f50..858325c9023 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
@@ -2,8 +2,6 @@
 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)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: removed
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 4b69fe42a39..d756bc92e26 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
@@ -2,8 +2,6 @@
 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)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: removed
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
index fe933e4c677..96cc41be667 100644
--- 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
@@ -1,8 +1,6 @@
 ---
 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
 value_type: number
 status: active
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
index 5bd5653b1e3..c23d05e6107 100644
--- 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
@@ -1,8 +1,6 @@
 ---
 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
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml b/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml
index 88b514194b9..ff23b2643c5 100644
--- a/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_container_scanning_monthly
 description: Monthly counts for implicit use of Container Scanning CI template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml
index e86498a3f85..09e11079f02 100644
--- a/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_container_scanning_latest_monthly
 description: Monthly counts for Container Scanning CI Latest template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml
index eabe049ea57..1357539b8bc 100644
--- a/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_container_scanning_monthly
 description: Monthly counts for Container Scanning CI template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20230215180530_p_ci_templates_security_api_discovery_monthly.yml b/config/metrics/counts_28d/20230215180530_p_ci_templates_security_api_discovery_monthly.yml
index 13fd0f295ec..533fd0ea114 100644
--- a/config/metrics/counts_28d/20230215180530_p_ci_templates_security_api_discovery_monthly.yml
+++ b/config/metrics/counts_28d/20230215180530_p_ci_templates_security_api_discovery_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_api_discovery_monthly
 description: Monthly counts for API Discovery CI template
-product_section: sec
-product_stage: secure
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20230509140528_p_ci_templates_security_bas_latest_monthly.yml b/config/metrics/counts_28d/20230509140528_p_ci_templates_security_bas_latest_monthly.yml
index b1ebcac1427..2030a242c3b 100644
--- a/config/metrics/counts_28d/20230509140528_p_ci_templates_security_bas_latest_monthly.yml
+++ b/config/metrics/counts_28d/20230509140528_p_ci_templates_security_bas_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_bas_latest_monthly
 description: Count of pipelines using the latest Breach and Attack Simulation template
-product_section: sec
-product_stage: secure
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216180416_i_search_total.yml b/config/metrics/counts_7d/20210216180416_i_search_total.yml
index 8d48d65140d..b3a5cecd0f0 100644
--- a/config/metrics/counts_7d/20210216180416_i_search_total.yml
+++ b/config/metrics/counts_7d/20210216180416_i_search_total.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: search_unique_visits.i_search_total
 description: Removed as duplicate of redis_hll_counters.search.i_search_total_weekly
-product_section: enablement
-product_stage: enablement
 product_group: global_search
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
index 51e47331240..9e3ea8f5acd 100644
--- a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
+++ b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.search.i_search_total_weekly
 description: Calculated unique users to perform Basic or Advanced searches by week
-product_section: enablement
-product_stage: enablement
 product_group: global_search
 value_type: number
 status: active
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 8d8d80ccaa8..e3efc17ecab 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
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.search.search_total_unique_counts_weekly
 description: Calculated unique users to perform Basic or Advanced searches by week
-product_section: enablement
-product_stage: enablement
 product_group: global_search
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml b/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
index f2d4909df3a..81e18cd248f 100644
--- a/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
+++ b/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts_weekly.aggregated_metrics.product_analytics_test_metrics_union
 description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
index e8beab832d5..988877e4337 100644
--- a/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
+++ b/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts_weekly.aggregated_metrics.product_analytics_test_metrics_intersection
 description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
index 93eb662f656..42f147486d3 100644
--- a/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.secure.users_expanding_secure_security_report_weekly
 description: Count of expanding the security report widget
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml
index e3c9e71392a..ad23f6b0a80 100644
--- a/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_sast_iac_latest_weekly
 description: Count of pipelines using the latest SAST IaC template
-product_section: sec
-product_stage: secure
 product_group: "static_analysis"
 value_type: number
 status: active
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 8098f1f248c..b6ae7b45c7c 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
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_sast_iac_latest_weekly
 description: Count of pipelines with implicit runs using the latest SAST IaC template
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml
index 7d0143c736e..87fe5e59090 100644
--- a/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_iac_latest_weekly
 description: Count of pipelines using the latest SAST IaC template
-product_section: sec
-product_stage: secure
 product_group: "static_analysis"
 value_type: number
 status: active
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 fa71e7cc8b3..0835a2e2717 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
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_sast_iac_latest_weekly
 description: Count of pipelines with implicit runs using the latest SAST IaC template
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20211118200524_p_ci_templates_security_dast_on_demand_api_scan_weekly.yml b/config/metrics/counts_7d/20211118200524_p_ci_templates_security_dast_on_demand_api_scan_weekly.yml
index e1f56f981ed..3a8f8db95ce 100644
--- a/config/metrics/counts_7d/20211118200524_p_ci_templates_security_dast_on_demand_api_scan_weekly.yml
+++ b/config/metrics/counts_7d/20211118200524_p_ci_templates_security_dast_on_demand_api_scan_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dast_on_demand_api_scan_weekly
 description: Count of pipelines using the latest DAST API template
-product_section: sec
-product_stage: secure
 product_group: "dynamic_analysis"
 value_type: number
 status: active
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 52ab17805b1..9b0d5add8aa 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
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_dast_api_latest_weekly
 description: Weekly counts for DAST API latest CI template
-product_section: sec
-product_stage: secure
 product_group: dynamic_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml b/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml
index 9e48535077d..2d1d41d614e 100644
--- a/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml
+++ b/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.testing.users_expanding_testing_license_compliance_report_weekly
 description: Count of expanding the license compliance widget
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml b/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml
index 0e62079f27b..d1898bccb7f 100644
--- a/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml
+++ b/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.testing.users_visiting_testing_license_compliance_full_report_weekly
 description: Count of visiting the license compliance full report
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20211201194402_p_ci_templates_security_dast_api_latest_weekly.yml b/config/metrics/counts_7d/20211201194402_p_ci_templates_security_dast_api_latest_weekly.yml
index efc0d42ce6e..2aa786eec3d 100644
--- a/config/metrics/counts_7d/20211201194402_p_ci_templates_security_dast_api_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211201194402_p_ci_templates_security_dast_api_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dast_api_latest_weekly
 description: Weekly counts for DAST API latest CI template
-product_section: sec
-product_stage: secure
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml b/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml
index bf5e73ff6d7..656442a052a 100644
--- a/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml
+++ b/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.testing.users_visiting_testing_manage_license_compliance_weekly
 description: Count of visiting the manage license compliance page
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml b/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml
index cc6f13b3ef6..5f8815d3fc7 100644
--- a/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml
+++ b/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.testing.users_clicking_license_testing_visiting_external_website_weekly
 description: Count of users clicking licence to visit external information website
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_weekly.yml b/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_weekly.yml
index f41d8d24092..5c3e12373aa 100644
--- a/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_dependency_scanning_weekly
 description: Weekly counts for implicit use of Dependency Scanning CI template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_weekly.yml b/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_weekly.yml
index 0970fdd8740..71721fa9b0f 100644
--- a/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_license_scanning_weekly
 description: Weekly counts for implicit use of License Scanning CI template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_dependency_scanning_weekly.yml b/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_dependency_scanning_weekly.yml
index 40f18a447bf..f1366928f3d 100644
--- a/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_dependency_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_dependency_scanning_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_dependency_scanning_weekly
 description: Weekly counts for Dependency Scanning CI template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_license_scanning_weekly.yml b/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_license_scanning_weekly.yml
index 4b97f76578b..f4e27cb6211 100644
--- a/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_license_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_license_scanning_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_license_scanning_weekly
 description: Weekly counts for License Scanning CI template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml b/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml
index 82a80a35634..14d98b615e8 100644
--- a/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_latest_weekly
 description: Weekly counts for SAST CI Latest template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml b/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml
index dc0a6a2df22..37914e89baa 100644
--- a/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_secret_detection_latest_weekly
 description: Weekly counts for Secret Detection CI Latest template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: active
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 387fd073cff..911af79e393 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
@@ -2,8 +2,6 @@
 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)
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
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 ee3338f8b75..11e3ddf1c2a 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
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_sast_latest_weekly
 description: Weekly counts for implicit use of SAST CI Latest template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml b/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml
index 48e617560fe..734a9884f62 100644
--- a/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml
+++ b/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_iac_weekly
 description: Count of pipelines using the stable SAST IaC template
-product_section: sec
-product_stage: secure
 product_group: "static_analysis"
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml b/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml
index b10aa57097f..e684fefc878 100644
--- a/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml
+++ b/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_sast_iac_weekly
 description: Count of pipelines using the stable SAST IaC template
-product_section: sec
-product_stage: secure
 product_group: "static_analysis"
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml b/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml
index 7a58d4a00dd..07bf6cd3aa0 100644
--- a/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml
+++ b/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_katalon_weekly
 description: 'Weekly counts of times users have executed katalon_tests jobs'
-product_section: 'ops'
-product_stage: 'analytics'
 product_group: 'pipeline_authoring'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220715195411_p_ci_templates_security_fortify_fod_sast_weekly.yml b/config/metrics/counts_7d/20220715195411_p_ci_templates_security_fortify_fod_sast_weekly.yml
index 19a5bf2565c..10c915528f5 100644
--- a/config/metrics/counts_7d/20220715195411_p_ci_templates_security_fortify_fod_sast_weekly.yml
+++ b/config/metrics/counts_7d/20220715195411_p_ci_templates_security_fortify_fod_sast_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_fortify_fod_sast_weekly
 description: Count of pipelines using the Fortify FoD SAST template
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: active
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 29c15c8c6c0..5a48dc24fc0 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
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_fortify_fod_sast_weekly
 description: Count of pipelines with implicit runs using the Fortify FoD SAST template
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
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 522d7db9f1c..936035e55e9 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
@@ -2,8 +2,6 @@
 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
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
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 4703f559f9c..79ee399496b 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
@@ -2,8 +2,6 @@
 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
-product_section: sec
-product_stage: secure
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20220907202801_p_ci_templates_jobs_dependency_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220907202801_p_ci_templates_jobs_dependency_scanning_latest_weekly.yml
index 48fbe12bfcc..c74194f37f2 100644
--- a/config/metrics/counts_7d/20220907202801_p_ci_templates_jobs_dependency_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220907202801_p_ci_templates_jobs_dependency_scanning_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_dependency_scanning_latest_weekly
 description: Weekly counts for Dependency Scanning CI Latest template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220907211959_p_ci_templates_security_container_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220907211959_p_ci_templates_security_container_scanning_latest_weekly.yml
index e08a28e4d6c..b67e60e37b7 100644
--- a/config/metrics/counts_7d/20220907211959_p_ci_templates_security_container_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220907211959_p_ci_templates_security_container_scanning_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_container_scanning_latest_weekly
 description: Weekly counts for Container Scanning CI Latest template (Security folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220907215629_p_ci_templates_jobs_license_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220907215629_p_ci_templates_jobs_license_scanning_latest_weekly.yml
index dba0530dc70..e10e7b02f49 100644
--- a/config/metrics/counts_7d/20220907215629_p_ci_templates_jobs_license_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220907215629_p_ci_templates_jobs_license_scanning_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_license_scanning_latest_weekly
 description: Weekly counts for License Scanning CI Latest template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
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 b77aafc4f38..28be3f28246 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
@@ -2,8 +2,6 @@
 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)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: removed
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 67c3de71112..a5a9fea069a 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
@@ -2,8 +2,6 @@
 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)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: removed
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 a445657c004..f18c4f5349b 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
@@ -2,8 +2,6 @@
 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)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: removed
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
index 6763576823f..99362f8a59a 100644
--- 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
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_coverage_fuzzing_latest_weekly
 description: Weekly counts for Coverage Fuzzing latest CI template. Originally monthly count, fixed in 17.0.
-product_section: sec
-product_stage: secure
 product_group: dynamic_analysis
 value_type: number
 status: active
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
index 0ddba8f0bf4..e0bbebfbf85 100644
--- 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
@@ -1,8 +1,6 @@
 ---
 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
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml b/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml
index f1bf2780288..c21c4a7ace2 100644
--- a/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_container_scanning_weekly
 description: Weekly counts for implicit use of Container Scanning CI template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml
index 577fdbc16c1..5e613e701e8 100644
--- a/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_container_scanning_latest_weekly
 description: Weekly counts for Container Scanning CI Latest template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml
index f933295c3c0..911e68749f4 100644
--- a/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_container_scanning_weekly
 description: Weekly counts for Container Scanning CI template (Jobs folder)
-product_section: sec
-product_stage: secure
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230215180530_p_ci_templates_security_api_discovery_weekly.yml b/config/metrics/counts_7d/20230215180530_p_ci_templates_security_api_discovery_weekly.yml
index 6d478b648ce..ad84001fbad 100644
--- a/config/metrics/counts_7d/20230215180530_p_ci_templates_security_api_discovery_weekly.yml
+++ b/config/metrics/counts_7d/20230215180530_p_ci_templates_security_api_discovery_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_api_discovery_weekly
 description: Weekly counts for API Discovery CI template
-product_section: sec
-product_stage: secure
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230509140526_p_ci_templates_security_bas_latest_weekly.yml b/config/metrics/counts_7d/20230509140526_p_ci_templates_security_bas_latest_weekly.yml
index fe44c289e94..4eccad9fd52 100644
--- a/config/metrics/counts_7d/20230509140526_p_ci_templates_security_bas_latest_weekly.yml
+++ b/config/metrics/counts_7d/20230509140526_p_ci_templates_security_bas_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_bas_latest_weekly
 description: Count of pipelines using the latest Breach and Attack Simulation template
-product_section: sec
-product_stage: secure
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180413_all_searches.yml b/config/metrics/counts_all/20210216180413_all_searches.yml
index 7a5ab7e3d7d..0a5a716ce71 100644
--- a/config/metrics/counts_all/20210216180413_all_searches.yml
+++ b/config/metrics/counts_all/20210216180413_all_searches.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: counts.all_searches
 description: Total Searches for All Basic Search and Advanced Search in self-managed
   and SaaS
-product_section: enablement
-product_stage: enablement
 product_group: global_search
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180414_navbar_searches.yml b/config/metrics/counts_all/20210216180414_navbar_searches.yml
index 6b59141842d..530cf77a40a 100644
--- a/config/metrics/counts_all/20210216180414_navbar_searches.yml
+++ b/config/metrics/counts_all/20210216180414_navbar_searches.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: counts.navbar_searches
 description: Total Searches using the navbar for All Basic Search and Advanced Search
   in self-managed and SaaS
-product_section: enablement
-product_stage: enablement
 product_group: global_search
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180750_groups.yml b/config/metrics/counts_all/20210216180750_groups.yml
index 908bff6ea1c..fe9ff2435af 100644
--- a/config/metrics/counts_all/20210216180750_groups.yml
+++ b/config/metrics/counts_all/20210216180750_groups.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: counts.groups
 description: Total count of groups as of usage ping snapshot
-product_section: sec
-product_stage: govern
 product_group: authentication
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180752_keys.yml b/config/metrics/counts_all/20210216180752_keys.yml
index ad34973acd7..e9161f58a9f 100644
--- a/config/metrics/counts_all/20210216180752_keys.yml
+++ b/config/metrics/counts_all/20210216180752_keys.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.keys
 description: Number of keys.
-product_section: sec
-product_stage: govern
 product_group: authentication
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180756_groups.yml b/config/metrics/counts_all/20210216180756_groups.yml
index 3da0b931cf9..f1dd7831ee3 100644
--- a/config/metrics/counts_all/20210216180756_groups.yml
+++ b/config/metrics/counts_all/20210216180756_groups.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage.manage.groups
 description: Number of users who are group members.
-product_section: sec
-product_stage: govern
 product_group: authentication
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180758_users_created.yml b/config/metrics/counts_all/20210216180758_users_created.yml
index 01e1f20a78d..34dc13efa0a 100644
--- a/config/metrics/counts_all/20210216180758_users_created.yml
+++ b/config/metrics/counts_all/20210216180758_users_created.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage.manage.users_created
 description: Number of users
-product_section: sec
-product_stage: govern
 product_group: authentication
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216183400_omniauth_providers.yml b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
index facf989686e..2ed97a3f716 100644
--- a/config/metrics/counts_all/20210216183400_omniauth_providers.yml
+++ b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage.manage.omniauth_providers
 description: List of unique OmniAuth providers
-product_section: sec
-product_stage: govern
 product_group: authentication
 value_type: object
 status: active
diff --git a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
index 8e16f073757..088340a5319 100644
--- a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
+++ b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_create_0_sent
 description: Total sent emails of the create track's first email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
index 68f0629928c..1a86844cc60 100644
--- a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_create_0_cta_clicked
 description: Total clicks on the create track's first email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
index 1be199da16b..0125f83a060 100644
--- a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
+++ b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_create_1_sent
 description: Total sent emails of the create track's second email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
index b631a50eea7..6aa7a1ea968 100644
--- a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_create_1_cta_clicked
 description: Total clicks on the create track's second email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
index 21b3f78552c..06984188cf4 100644
--- a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
+++ b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_create_2_sent
 description: Total sent emails of the create track's third email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
index b0edc023a51..43248067613 100644
--- a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_create_2_cta_clicked
 description: Total clicks on the create track's third email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
index 06d8c20596e..f7588109c42 100644
--- a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
+++ b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_verify_0_sent
 description: Total sent emails of the verify track's first email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
index 0ec0ff54c07..6d32f3816ea 100644
--- a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_verify_0_cta_clicked
 description: Total clicks on the verify track's first email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
index 170f8ff6c8a..a97faa1bb29 100644
--- a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
+++ b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_verify_1_sent
 description: Total sent emails of the verify track's second email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
index 0d53136ec67..eab5a2cd0d0 100644
--- a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_verify_1_cta_clicked
 description: Total clicks on the verify track's second email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
index 57ae962b75b..33331c65fbf 100644
--- a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
+++ b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_verify_2_sent
 description: Total sent emails of the verify track's third email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
index 43aa1ea6cff..413de277c1c 100644
--- a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_verify_2_cta_clicked
 description: Total clicks on the verify track's third email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
index dd037658198..187f83010d5 100644
--- a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
+++ b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_trial_0_sent
 description: Total sent emails of the trial track's first email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
index d2df99c0cce..8200b3fb352 100644
--- a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_trial_0_cta_clicked
 description: Total clicks on the verify trial's first email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
index 666065045f3..bccacda4755 100644
--- a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
+++ b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_trial_1_sent
 description: Total sent emails of the trial track's second email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
index fb2505fc30a..070e1568c95 100644
--- a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_trial_1_cta_clicked
 description: Total clicks on the trial track's second email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
index 31f4e8154ef..36be0ba6b38 100644
--- a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
+++ b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_trial_2_sent
 description: Total sent emails of the trial track's third email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
index f69e61b9a85..a62e69a7d05 100644
--- a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_trial_2_cta_clicked
 description: Total clicks on the trial track's third email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
index 3ebd0e96074..36a04936c64 100644
--- a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
+++ b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_team_0_sent
 description: Total sent emails of the team track's first email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
index a6533d7abc8..a9611c078fa 100644
--- a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_team_0_cta_clicked
 description: Total clicks on the team track's first email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
index 0750bfae82d..045a115a7db 100644
--- a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
+++ b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_team_1_sent
 description: Total sent emails of the team track's second email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
index 3a74dd6870a..b1080fb806c 100644
--- a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_team_1_cta_clicked
 description: Total clicks on the team track's second email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
index 351c4649003..e229c86a1eb 100644
--- a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
+++ b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_team_2_sent
 description: Total sent emails of the team track's third email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
index a8cf20317f7..c43cb278af6 100644
--- a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_team_2_cta_clicked
 description: Total clicks on the team track's third email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
index 7d3f47699fe..c55c38afb92 100644
--- a/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
+++ b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.in_product_marketing_email_experience_0_sent
 description: Total sent emails of the experience track's first email
-product_section: 'TBD'
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml b/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
index 70f486412f2..0e3853be809 100644
--- a/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.in_product_marketing_email_team_short_0_cta_clicked
 description: Total clicks on the team_short track's first email
-product_section: growth
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml b/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
index 62d4196d39a..ef3bd92ab8b 100644
--- a/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
+++ b/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.in_product_marketing_email_team_short_0_sent
 description: Total sent emails of the team_short track's first email
-product_section: growth
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml b/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
index 260c2b9bb33..525ae303126 100644
--- a/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.in_product_marketing_email_trial_short_0_cta_clicked
 description: Total clicks on the trial_short track's first email
-product_section: growth
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml b/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
index 41f2d30f3c6..852f2f1c5aa 100644
--- a/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
+++ b/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.in_product_marketing_email_trial_short_0_sent
 description: Total sent emails of the trial_short track's first email
-product_section: growth
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
index 1d5c3a07d07..c68691afbc7 100644
--- a/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.in_product_marketing_email_admin_verify_0_cta_clicked
 description: Total clicks on the admin_verify track's first email
-product_section: growth
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml b/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
index a594335f068..a712f17cd46 100644
--- a/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
+++ b/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.in_product_marketing_email_admin_verify_0_sent
 description: Total sent emails of the admin_verify track's first email
-product_section: growth
-product_stage: growth
 product_group: activation
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
index 2c990d82154..13114fc7b33 100644
--- a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
+++ b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
@@ -1,8 +1,6 @@
 ---
 key_path: usage_activity_by_stage.manage.user_auth_by_provider
 description: Number of unique user logins using two factor authentication for available providers
-product_section: sec
-product_stage: govern
 product_group: authentication
 value_type: object
 status: active
diff --git a/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml b/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml
index 67ec736eb88..a6b01130dee 100644
--- a/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml
+++ b/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml
@@ -2,8 +2,6 @@
 key_path: counts.service_usage_data_download_payload_click
 description: Count Download Payload button clicks
 data_category: optional
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220825232556_count_user_auth.yml b/config/metrics/counts_all/20220825232556_count_user_auth.yml
index e520fd6bd9a..340ec99d896 100644
--- a/config/metrics/counts_all/20220825232556_count_user_auth.yml
+++ b/config/metrics/counts_all/20220825232556_count_user_auth.yml
@@ -1,8 +1,6 @@
 ---
 key_path: usage_activity_by_stage.manage.count_user_auth
 description: Number of unique user logins
-product_section: sec
-product_stage: govern
 product_group: authentication
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/count_total_click_create_confidential_mr_issues_list.yml b/config/metrics/counts_all/count_total_click_create_confidential_mr_issues_list.yml
index 7f83078548a..f1cfe17b8b2 100644
--- a/config/metrics/counts_all/count_total_click_create_confidential_mr_issues_list.yml
+++ b/config/metrics/counts_all/count_total_click_create_confidential_mr_issues_list.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_click_create_confidential_mr_issues_list
 description: Total count of clicks Create confidential merge request on issues list
-product_section: growth
-product_stage: growth
 product_group: acquisition
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_all/count_total_click_create_mr_issues_list.yml b/config/metrics/counts_all/count_total_click_create_mr_issues_list.yml
index 144a8214805..fb5e25ee471 100644
--- a/config/metrics/counts_all/count_total_click_create_mr_issues_list.yml
+++ b/config/metrics/counts_all/count_total_click_create_mr_issues_list.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_click_create_mr_issues_list
 description: Total count of clicks Create merge request on issues list
-product_section: growth
-product_stage: growth
 product_group: acquisition
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_all/count_total_click_new_merge_request_empty_list.yml b/config/metrics/counts_all/count_total_click_new_merge_request_empty_list.yml
index 862a37ff3a9..d0ba0e6d790 100644
--- a/config/metrics/counts_all/count_total_click_new_merge_request_empty_list.yml
+++ b/config/metrics/counts_all/count_total_click_new_merge_request_empty_list.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_click_new_merge_request_empty_list
 description: Total count of clicks New merge request on empty list
-product_section: growth
-product_stage: growth
 product_group: acquisition
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_all/count_total_click_new_merge_request_list.yml b/config/metrics/counts_all/count_total_click_new_merge_request_list.yml
index d3776fefd60..56a452bf281 100644
--- a/config/metrics/counts_all/count_total_click_new_merge_request_list.yml
+++ b/config/metrics/counts_all/count_total_click_new_merge_request_list.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_click_new_merge_request_list
 description: Total count of clicks New merge request on list
-product_section: growth
-product_stage: growth
 product_group: acquisition
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_all/count_total_create_mr_web_ide.yml b/config/metrics/counts_all/count_total_create_mr_web_ide.yml
index ba3c5409faa..f4cbaf6f066 100644
--- a/config/metrics/counts_all/count_total_create_mr_web_ide.yml
+++ b/config/metrics/counts_all/count_total_create_mr_web_ide.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_create_mr_web_ide
 description: Total count of created MRs from WebIDE
-product_section: growth
-product_stage: growth
 product_group: acquisition
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_all/count_total_visit_after_push_link_or_create_mr_banner.yml b/config/metrics/counts_all/count_total_visit_after_push_link_or_create_mr_banner.yml
index e56dbf9eb75..b2087e4f764 100644
--- a/config/metrics/counts_all/count_total_visit_after_push_link_or_create_mr_banner.yml
+++ b/config/metrics/counts_all/count_total_visit_after_push_link_or_create_mr_banner.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_visit_after_push_link_or_create_mr_banner
 description: Total count of visited after push links or created MRs from banner
-product_section: growth
-product_stage: growth
 product_group: acquisition
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/license/20210201124932_recorded_at.yml b/config/metrics/license/20210201124932_recorded_at.yml
index d53e6ccb098..b2c171cbbf5 100644
--- a/config/metrics/license/20210201124932_recorded_at.yml
+++ b/config/metrics/license/20210201124932_recorded_at.yml
@@ -2,8 +2,6 @@
 data_category: standard
 key_path: recorded_at
 description: When the Usage Ping computation was started
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: string
 status: active
diff --git a/config/metrics/license/20210201124933_uuid.yml b/config/metrics/license/20210201124933_uuid.yml
index c6e5133f521..9ada644e38d 100644
--- a/config/metrics/license/20210201124933_uuid.yml
+++ b/config/metrics/license/20210201124933_uuid.yml
@@ -1,8 +1,6 @@
 ---
 key_path: uuid
 description: GitLab instance unique identifier
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: string
 status: active
diff --git a/config/metrics/license/20210204124827_hostname.yml b/config/metrics/license/20210204124827_hostname.yml
index 500499e0763..011ab943edb 100644
--- a/config/metrics/license/20210204124827_hostname.yml
+++ b/config/metrics/license/20210204124827_hostname.yml
@@ -1,8 +1,6 @@
 ---
 key_path: hostname
 description: Host name of GitLab instance
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: string
 status: active
diff --git a/config/metrics/license/20210204124829_active_user_count.yml b/config/metrics/license/20210204124829_active_user_count.yml
index a4ee7d684fb..5e309ea054b 100644
--- a/config/metrics/license/20210204124829_active_user_count.yml
+++ b/config/metrics/license/20210204124829_active_user_count.yml
@@ -1,8 +1,6 @@
 ---
 key_path: active_user_count
 description: The number of active users existing in the instance. This is named the instance_user_count in the Versions application.
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: number
 status: active
diff --git a/config/metrics/license/20210204124938_recording_ce_finished_at.yml b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
index 021219d37b2..020a1bd7c3f 100644
--- a/config/metrics/license/20210204124938_recording_ce_finished_at.yml
+++ b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
@@ -2,8 +2,6 @@
 data_category: standard
 key_path: recording_ce_finished_at
 description: When the core features were computed
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: string
 status: active
diff --git a/config/metrics/license/20210216175601_version.yml b/config/metrics/license/20210216175601_version.yml
index f9d870ecd05..81929507f3f 100644
--- a/config/metrics/license/20210216175601_version.yml
+++ b/config/metrics/license/20210216175601_version.yml
@@ -2,8 +2,6 @@
 data_category: standard
 key_path: version
 description: Version of GitLab instance
-product_section: enablement
-product_stage: enablement
 product_group: distribution_deploy
 value_type: string
 status: active
diff --git a/config/metrics/license/20210216175602_installation_type.yml b/config/metrics/license/20210216175602_installation_type.yml
index d677b6dcc93..beaa49a8318 100644
--- a/config/metrics/license/20210216175602_installation_type.yml
+++ b/config/metrics/license/20210216175602_installation_type.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: installation_type
 description: The installation method used to install GitLab (Omnibus, Helm, etc)
-product_section: enablement
-product_stage: enablement
 product_group: distribution_deploy
 value_type: string
 status: active
diff --git a/config/metrics/license/20210216183237_version.yml b/config/metrics/license/20210216183237_version.yml
index 03e6538df37..b3fb7abe643 100644
--- a/config/metrics/license/20210216183237_version.yml
+++ b/config/metrics/license/20210216183237_version.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: git.version
 description: Information about Git version
-product_section: enablement
-product_stage: enablement
 product_group: distribution_deploy
 value_type: object
 value_json_schema: 'config/metrics/objects_schemas/git_version_schema.json'
diff --git a/config/metrics/license/20230228110448_installation_creation_date.yml b/config/metrics/license/20230228110448_installation_creation_date.yml
index 220bf6e051c..236258ceeb2 100644
--- a/config/metrics/license/20230228110448_installation_creation_date.yml
+++ b/config/metrics/license/20230228110448_installation_creation_date.yml
@@ -1,8 +1,6 @@
 ---
 key_path: installation_creation_date
 description: "The date and time the instance was installed"
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: string
 status: removed
diff --git a/config/metrics/license/20230314161014_gitlab_dedicated.yml b/config/metrics/license/20230314161014_gitlab_dedicated.yml
index 37346fd937c..c6c284e0bf5 100644
--- a/config/metrics/license/20230314161014_gitlab_dedicated.yml
+++ b/config/metrics/license/20230314161014_gitlab_dedicated.yml
@@ -1,8 +1,6 @@
 ---
 key_path: gitlab_dedicated
 description: Is the instance a Gitlab Dedicated instance
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: boolean
 status: active
diff --git a/config/metrics/license/20230505112412_installation_creation_date_approximation.yml b/config/metrics/license/20230505112412_installation_creation_date_approximation.yml
index e0f8c192b86..dfdc572a237 100644
--- a/config/metrics/license/20230505112412_installation_creation_date_approximation.yml
+++ b/config/metrics/license/20230505112412_installation_creation_date_approximation.yml
@@ -1,8 +1,6 @@
 ---
 key_path: installation_creation_date_approximation
 description: "The approximate date and time the instance was installed. Based on the first created user or application setting"
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: string
 status: active
diff --git a/config/metrics/license/20240327160214_gitlab_environment_toolkit.yml b/config/metrics/license/20240327160214_gitlab_environment_toolkit.yml
index ffe7a8a9330..d770247bb5f 100644
--- a/config/metrics/license/20240327160214_gitlab_environment_toolkit.yml
+++ b/config/metrics/license/20240327160214_gitlab_environment_toolkit.yml
@@ -1,8 +1,6 @@
 ---
 key_path: gitlab_environment_toolkit
 description: Is the instance provisioned with the Gitlab Environment Toolkit
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210201124935_database_adapter.yml b/config/metrics/settings/20210201124935_database_adapter.yml
index 789386706bd..837f77fdeb1 100644
--- a/config/metrics/settings/20210201124935_database_adapter.yml
+++ b/config/metrics/settings/20210201124935_database_adapter.yml
@@ -4,8 +4,6 @@ key_path: database.adapter
 description: This metric only returns a value of PostgreSQL in supported versions
   of GitLab. It could be removed from the usage ping. Historically MySQL was also
   supported.
-product_section: enablement
-product_stage: enablement
 product_group: distribution_deploy
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index 1af899ff7fd..6b5ce9410fe 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: gravatar_enabled
 description: Whether gravatar is enabled
-product_section: sec
-product_stage: govern
 product_group: authentication
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
index 59fa6ddfa8d..d4498e04837 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: ldap_enabled
 description: Whether LDAP is enabled
-product_section: sec
-product_stage: govern
 product_group: authentication
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
index 6d91d61d466..ebdedb79250 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: omniauth_enabled
 description: Whether OmniAuth is enabled
-product_section: sec
-product_stage: govern
 product_group: authentication
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
index ae30de3422d..6ed002a66ed 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: signup_enabled
 description: Whether public signup is enabled
-product_section: sec
-product_stage: govern
 product_group: authentication
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216174829_smtp_server.yml b/config/metrics/settings/20210216174829_smtp_server.yml
index a21165f6490..a9df22c51da 100644
--- a/config/metrics/settings/20210216174829_smtp_server.yml
+++ b/config/metrics/settings/20210216174829_smtp_server.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: mail.smtp_server
 description: The value of the SMTP server that is used
-product_section: growth
-product_stage: growth
 product_group: activation
 value_type: number
 status: active
diff --git a/config/metrics/settings/20210216175604_edition.yml b/config/metrics/settings/20210216175604_edition.yml
index d7fb9a298e6..af470aacb44 100644
--- a/config/metrics/settings/20210216175604_edition.yml
+++ b/config/metrics/settings/20210216175604_edition.yml
@@ -2,8 +2,6 @@
 data_category: standard
 key_path: edition
 description: Edition of GitLab such as EE or CE
-product_section: enablement
-product_stage: enablement
 product_group: distribution_deploy
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
index 066d33be2ac..3bd41bd85ab 100644
--- a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: settings.ldap_encrypted_secrets_enabled
 description: Is encrypted LDAP secrets configured?
-product_section: enablement
-product_stage: enablement
 product_group: distribution_deploy
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216175609_version.yml b/config/metrics/settings/20210216175609_version.yml
index c1561e3ceaa..cb651094af4 100644
--- a/config/metrics/settings/20210216175609_version.yml
+++ b/config/metrics/settings/20210216175609_version.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: database.version
 description: The version of the PostgreSQL database.
-product_section: enablement
-product_stage: enablement
 product_group: distribution_deploy
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216180836_enabled.yml b/config/metrics/settings/20210216180836_enabled.yml
index 79b3b443b8c..7e047d8f4c0 100644
--- a/config/metrics/settings/20210216180836_enabled.yml
+++ b/config/metrics/settings/20210216180836_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.artifacts.enabled
 description: Whether Object Storage is enabled for Artifacts
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180838_enabled.yml b/config/metrics/settings/20210216180838_enabled.yml
index ef365fa9097..04a49485ba4 100644
--- a/config/metrics/settings/20210216180838_enabled.yml
+++ b/config/metrics/settings/20210216180838_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.artifacts.object_store.enabled
 description: Whether Object Storage is enabled for Artifacts
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180840_direct_upload.yml b/config/metrics/settings/20210216180840_direct_upload.yml
index 4358f7ac7cc..a27910f0902 100644
--- a/config/metrics/settings/20210216180840_direct_upload.yml
+++ b/config/metrics/settings/20210216180840_direct_upload.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.artifacts.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for Artifacts
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180841_background_upload.yml b/config/metrics/settings/20210216180841_background_upload.yml
index f5e5a7195e4..3cedec84c8c 100644
--- a/config/metrics/settings/20210216180841_background_upload.yml
+++ b/config/metrics/settings/20210216180841_background_upload.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.artifacts.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for Artifacts
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: broken
diff --git a/config/metrics/settings/20210216180843_provider.yml b/config/metrics/settings/20210216180843_provider.yml
index 010c9e8a427..f4ca7ad24e1 100644
--- a/config/metrics/settings/20210216180843_provider.yml
+++ b/config/metrics/settings/20210216180843_provider.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.artifacts.object_store.provider
 description: What Object Storage provider has been configured for Artifacts
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216180845_enabled.yml b/config/metrics/settings/20210216180845_enabled.yml
index 13f30bfc5dd..f79a02b35ee 100644
--- a/config/metrics/settings/20210216180845_enabled.yml
+++ b/config/metrics/settings/20210216180845_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.external_diffs.enabled
 description: Whether Object Storage is enabled for External Diffs
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180847_enabled.yml b/config/metrics/settings/20210216180847_enabled.yml
index 850148626ee..ceed808261e 100644
--- a/config/metrics/settings/20210216180847_enabled.yml
+++ b/config/metrics/settings/20210216180847_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.external_diffs.object_store.enabled
 description: Whether Object Storage is enabled for External Diffs
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180849_direct_upload.yml b/config/metrics/settings/20210216180849_direct_upload.yml
index 4c32511a261..57219c3a0f2 100644
--- a/config/metrics/settings/20210216180849_direct_upload.yml
+++ b/config/metrics/settings/20210216180849_direct_upload.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.external_diffs.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for External Diffs
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180851_background_upload.yml b/config/metrics/settings/20210216180851_background_upload.yml
index 96bb2010d6d..c1c6c66ec72 100644
--- a/config/metrics/settings/20210216180851_background_upload.yml
+++ b/config/metrics/settings/20210216180851_background_upload.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: object_store.external_diffs.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for External
   Diffs
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: broken
diff --git a/config/metrics/settings/20210216180852_provider.yml b/config/metrics/settings/20210216180852_provider.yml
index a4202cd311e..3e9b7692ecd 100644
--- a/config/metrics/settings/20210216180852_provider.yml
+++ b/config/metrics/settings/20210216180852_provider.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.external_diffs.object_store.provider
 description: What Object Storage provider has been configured for External Diffs
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216180854_enabled.yml b/config/metrics/settings/20210216180854_enabled.yml
index 4083c67e004..2339e564e64 100644
--- a/config/metrics/settings/20210216180854_enabled.yml
+++ b/config/metrics/settings/20210216180854_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.lfs.enabled
 description: Whether Object Storage is enabled for LFS
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180856_enabled.yml b/config/metrics/settings/20210216180856_enabled.yml
index f8cf3cd94e8..c576d2b501d 100644
--- a/config/metrics/settings/20210216180856_enabled.yml
+++ b/config/metrics/settings/20210216180856_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.lfs.object_store.enabled
 description: Whether Object Storage is enabled for LFS
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180858_direct_upload.yml b/config/metrics/settings/20210216180858_direct_upload.yml
index 39574d5b3b6..342bfa3309a 100644
--- a/config/metrics/settings/20210216180858_direct_upload.yml
+++ b/config/metrics/settings/20210216180858_direct_upload.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.lfs.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for LFS
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180900_background_upload.yml b/config/metrics/settings/20210216180900_background_upload.yml
index 8cde5d0a2df..1a8476f2a86 100644
--- a/config/metrics/settings/20210216180900_background_upload.yml
+++ b/config/metrics/settings/20210216180900_background_upload.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.lfs.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for LFS
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: broken
diff --git a/config/metrics/settings/20210216180902_provider.yml b/config/metrics/settings/20210216180902_provider.yml
index a6c17290b01..a0f7b8d10a8 100644
--- a/config/metrics/settings/20210216180902_provider.yml
+++ b/config/metrics/settings/20210216180902_provider.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.lfs.object_store.provider
 description: What Object Storage provider has been configured for LFS
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216180903_enabled.yml b/config/metrics/settings/20210216180903_enabled.yml
index 8f379bce4c0..49a161bad35 100644
--- a/config/metrics/settings/20210216180903_enabled.yml
+++ b/config/metrics/settings/20210216180903_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.uploads.enabled
 description: Whether Object Storage is enabled for Uploads
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216180905_enabled.yml b/config/metrics/settings/20210216180905_enabled.yml
index 51a3afdb0af..e58d7ff2a91 100644
--- a/config/metrics/settings/20210216180905_enabled.yml
+++ b/config/metrics/settings/20210216180905_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.uploads.object_store.enabled
 description: Whether Object Storage is enabled for Uploads
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180907_direct_upload.yml b/config/metrics/settings/20210216180907_direct_upload.yml
index b25ee083d17..74e3a95295f 100644
--- a/config/metrics/settings/20210216180907_direct_upload.yml
+++ b/config/metrics/settings/20210216180907_direct_upload.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.uploads.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for Uploads
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180909_background_upload.yml b/config/metrics/settings/20210216180909_background_upload.yml
index 695edf0157c..011e6f9ebb7 100644
--- a/config/metrics/settings/20210216180909_background_upload.yml
+++ b/config/metrics/settings/20210216180909_background_upload.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.uploads.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for Uploads
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: broken
diff --git a/config/metrics/settings/20210216180911_provider.yml b/config/metrics/settings/20210216180911_provider.yml
index d4a0555eee2..0188809f316 100644
--- a/config/metrics/settings/20210216180911_provider.yml
+++ b/config/metrics/settings/20210216180911_provider.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.uploads.object_store.provider
 description: What Object Storage provider has been configured for Uploads
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
index c99ea17cb59..024bf52ef73 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: object_store.packages.enabled
 description: Whether Object Storage is enabled for Uploads
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180915_enabled.yml b/config/metrics/settings/20210216180915_enabled.yml
index 09fa1d2d4e5..b6cd66b3b1e 100644
--- a/config/metrics/settings/20210216180915_enabled.yml
+++ b/config/metrics/settings/20210216180915_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.packages.object_store.enabled
 description: Whether Object Storage is enabled for Packages
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180916_direct_upload.yml b/config/metrics/settings/20210216180916_direct_upload.yml
index 300c37a9efc..dca6ddaed15 100644
--- a/config/metrics/settings/20210216180916_direct_upload.yml
+++ b/config/metrics/settings/20210216180916_direct_upload.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.packages.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for Packages
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180918_background_upload.yml b/config/metrics/settings/20210216180918_background_upload.yml
index a91e4f16764..8f933b5d4ec 100644
--- a/config/metrics/settings/20210216180918_background_upload.yml
+++ b/config/metrics/settings/20210216180918_background_upload.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.packages.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for Packages
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: boolean
 status: broken
diff --git a/config/metrics/settings/20210216180920_provider.yml b/config/metrics/settings/20210216180920_provider.yml
index 8afbe1cb127..9441eb41c53 100644
--- a/config/metrics/settings/20210216180920_provider.yml
+++ b/config/metrics/settings/20210216180920_provider.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: object_store.packages.object_store.provider
 description: What Object Storage provider has been configured for Packages
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216183248_pg_system_id.yml b/config/metrics/settings/20210216183248_pg_system_id.yml
index 3dd05f7e851..8ab756cec7e 100644
--- a/config/metrics/settings/20210216183248_pg_system_id.yml
+++ b/config/metrics/settings/20210216183248_pg_system_id.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: database.pg_system_id
 description: TBD
-product_section: enablement
-product_stage: enablement
 product_group: distribution_deploy
 value_type: number
 status: active
diff --git a/config/metrics/settings/20210225045628_operating_system.yml b/config/metrics/settings/20210225045628_operating_system.yml
index dbd10b04a0d..75ac2b5e784 100644
--- a/config/metrics/settings/20210225045628_operating_system.yml
+++ b/config/metrics/settings/20210225045628_operating_system.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: settings.operating_system
 description: Information about the operating system running GitLab
-product_section: enablement
-product_stage: enablement
 product_group: distribution_deploy
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210323120839_topology.yml b/config/metrics/settings/20210323120839_topology.yml
index 9c962dd3aa6..ef8f4c1d792 100644
--- a/config/metrics/settings/20210323120839_topology.yml
+++ b/config/metrics/settings/20210323120839_topology.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: topology
 description: Topology data
-product_section: enablement
-product_stage: enablement
 product_group: cloud_connector
 value_type: object
 status: active
diff --git a/config/metrics/settings/20210702140138_collected_data_categories.yml b/config/metrics/settings/20210702140138_collected_data_categories.yml
index 79e5f50e231..4b4db26f112 100644
--- a/config/metrics/settings/20210702140138_collected_data_categories.yml
+++ b/config/metrics/settings/20210702140138_collected_data_categories.yml
@@ -2,8 +2,6 @@
 key_path: settings.collected_data_categories
 name: collected_data_categories
 description: List of collected data categories corresponding to instance settings
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: object
 status: active
diff --git a/config/metrics/settings/20210812202137_smtp_encrypted_secrets_enabled.yml b/config/metrics/settings/20210812202137_smtp_encrypted_secrets_enabled.yml
index 7b45ff508de..02f68c62482 100644
--- a/config/metrics/settings/20210812202137_smtp_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20210812202137_smtp_encrypted_secrets_enabled.yml
@@ -1,8 +1,6 @@
 ---
 key_path: settings.smtp_encrypted_secrets_enabled
 description: Is encrypted SMTP secrets configured?
-product_section: enablement
-product_stage: enablement
 product_group: distribution_deploy
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210915152326_service_ping_features_enabled.yml b/config/metrics/settings/20210915152326_service_ping_features_enabled.yml
index 46dd4968bd4..55fd72f622a 100644
--- a/config/metrics/settings/20210915152326_service_ping_features_enabled.yml
+++ b/config/metrics/settings/20210915152326_service_ping_features_enabled.yml
@@ -2,8 +2,6 @@
 key_path: settings.service_ping_features_enabled
 name: "service_ping_features_enabled"
 description: Whether Service Ping features are enabled
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20211124061450_snowplow_enabled.yml b/config/metrics/settings/20211124061450_snowplow_enabled.yml
index 8c8debd8064..b08042f7f83 100644
--- a/config/metrics/settings/20211124061450_snowplow_enabled.yml
+++ b/config/metrics/settings/20211124061450_snowplow_enabled.yml
@@ -2,8 +2,6 @@
 key_path: settings.snowplow_enabled
 name: snowplow_enabled_gitlab_instance
 description: Whether snowplow is enabled for the GitLab instance
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml b/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml
index d37c1dddc5f..8f9cdbb4b69 100644
--- a/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml
+++ b/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml
@@ -2,8 +2,6 @@
 key_path: settings.snowplow_configured_to_gitlab_collector
 name: snowplow_configured_to_gitlab_collector
 description: Metric informs if currently configured Snowplow collector hostname points towards Gitlab Snowplow collection pipeline.
-product_section: analytics
-product_stage: analytics
 product_group: analytics_instrumentation
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20211201012652_flavor.yml b/config/metrics/settings/20211201012652_flavor.yml
index 625afabb029..7767d588ec0 100644
--- a/config/metrics/settings/20211201012652_flavor.yml
+++ b/config/metrics/settings/20211201012652_flavor.yml
@@ -4,8 +4,6 @@ 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",
   "AlloyDB for PostgreSQL", or "null".
-product_section: enablement
-product_stage: enablement
 product_group: database
 value_type: string
 status: active
diff --git a/config/metrics/settings/20221015152126_deactivate_dormant_users_enabled.yml b/config/metrics/settings/20221015152126_deactivate_dormant_users_enabled.yml
index 4a1cacfcfb2..f4cb8534cf7 100644
--- a/config/metrics/settings/20221015152126_deactivate_dormant_users_enabled.yml
+++ b/config/metrics/settings/20221015152126_deactivate_dormant_users_enabled.yml
@@ -1,8 +1,6 @@
 ---
 key_path: deactivate_dormant_users_enabled
 description: Whether Dormant User Deactivation is enabled
-product_section: fulfillment
-product_stage: fulfillment
 product_group: utilization
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20221015161233_deactivate_dormant_users_period.yml b/config/metrics/settings/20221015161233_deactivate_dormant_users_period.yml
index 015cffd4032..395a20a30cc 100644
--- a/config/metrics/settings/20221015161233_deactivate_dormant_users_period.yml
+++ b/config/metrics/settings/20221015161233_deactivate_dormant_users_period.yml
@@ -1,8 +1,6 @@
 ---
 key_path: deactivate_dormant_users_period
 description: The value of the dormant users period being used
-product_section: fulfillment
-product_stage: fulfillment
 product_group: utilization
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20230125220526_incoming_email_encrypted_secrets_enabled.yml b/config/metrics/settings/20230125220526_incoming_email_encrypted_secrets_enabled.yml
index 611354f4684..8c73209ce67 100644
--- a/config/metrics/settings/20230125220526_incoming_email_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20230125220526_incoming_email_encrypted_secrets_enabled.yml
@@ -1,8 +1,6 @@
 ---
 key_path: settings.incoming_email_encrypted_secrets_enabled
 description: Are encrypted incoming email secrets configured?
-product_section: enablement
-product_stage: enablement
 product_group: distribution_deploy
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20230125221700_service_desk_email_encrypted_secrets_enabled.yml b/config/metrics/settings/20230125221700_service_desk_email_encrypted_secrets_enabled.yml
index 68b087a3afd..b9c7f779df3 100644
--- a/config/metrics/settings/20230125221700_service_desk_email_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20230125221700_service_desk_email_encrypted_secrets_enabled.yml
@@ -1,8 +1,6 @@
 ---
 key_path: settings.service_desk_email_encrypted_secrets_enabled
 description: Are service desk email secrets configured?
-product_section: enablement
-product_stage: enablement
 product_group: distribution_deploy
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20230203164341_index_inconsistencies_metric.yml b/config/metrics/settings/20230203164341_index_inconsistencies_metric.yml
index 08016b5143e..30a64814551 100644
--- a/config/metrics/settings/20230203164341_index_inconsistencies_metric.yml
+++ b/config/metrics/settings/20230203164341_index_inconsistencies_metric.yml
@@ -2,8 +2,6 @@
 key_path: index_inconsistencies
 name: "index_inconsistencies"
 description: "List the index inconsistencies in the database"
-product_section: enablement
-product_stage: enablement
 product_group: database
 value_type: object
 status: active
diff --git a/config/metrics/settings/20230328165533_mode.yml b/config/metrics/settings/20230328165533_mode.yml
index bc8019d86aa..88666f2d57c 100644
--- a/config/metrics/settings/20230328165533_mode.yml
+++ b/config/metrics/settings/20230328165533_mode.yml
@@ -2,8 +2,6 @@
 key_path: database.mode
 description: What PostgreSQL database mode is used. Possible values are
   "single-database", "single-database-ci-connection", or "multiple-databases"
-product_section: enablement
-product_stage: enablement
 product_group: database
 product_category: database
 value_type: string
diff --git a/config/metrics/settings/20230612132238_schema_inconsistencies_metric.yml b/config/metrics/settings/20230612132238_schema_inconsistencies_metric.yml
index 1a154b4a2b0..f5cd1cc01d2 100644
--- a/config/metrics/settings/20230612132238_schema_inconsistencies_metric.yml
+++ b/config/metrics/settings/20230612132238_schema_inconsistencies_metric.yml
@@ -2,8 +2,6 @@
 key_path: schema_inconsistencies_metric
 name: "schema_inconsistencies"
 description: "List the schema inconsistencies in the database"
-product_section: enablement
-product_stage: enablement
 product_group: database
 value_type: boolean
 status: active
diff --git a/db/post_migrate/20240603080216_remove_partition_id_default_value_for_ci_daily_build_group_report_result.rb b/db/post_migrate/20240603080216_remove_partition_id_default_value_for_ci_daily_build_group_report_result.rb
new file mode 100644
index 00000000000..654e9966f28
--- /dev/null
+++ b/db/post_migrate/20240603080216_remove_partition_id_default_value_for_ci_daily_build_group_report_result.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class RemovePartitionIdDefaultValueForCiDailyBuildGroupReportResult < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+
+  TABLE_NAME = :ci_daily_build_group_report_results
+  COLUM_NAME = :partition_id
+
+  def change
+    change_column_default(TABLE_NAME, COLUM_NAME, from: 100, to: nil)
+  end
+end
diff --git a/db/schema_migrations/20240603080216 b/db/schema_migrations/20240603080216
new file mode 100644
index 00000000000..d5950440814
--- /dev/null
+++ b/db/schema_migrations/20240603080216
@@ -0,0 +1 @@
+9c737c727d598361d7f27e2f08819bd9c9a85a57eb37426ddf8125045f0210cc
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 9d2c67b6284..e821dbaf2e1 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -6652,7 +6652,7 @@ CREATE TABLE ci_daily_build_group_report_results (
     data jsonb NOT NULL,
     default_branch boolean DEFAULT false NOT NULL,
     group_id bigint,
-    partition_id bigint DEFAULT 100 NOT NULL
+    partition_id bigint NOT NULL
 );
 
 CREATE SEQUENCE ci_daily_build_group_report_results_id_seq
diff --git a/doc/administration/self_hosted_models/configure_duo_features.md b/doc/administration/self_hosted_models/configure_duo_features.md
index d3b5ae206a7..ec6cb693296 100644
--- a/doc/administration/self_hosted_models/configure_duo_features.md
+++ b/doc/administration/self_hosted_models/configure_duo_features.md
@@ -11,6 +11,12 @@ DETAILS:
 **Tier:** Premium, Ultimate
 **Offering:** Self-managed
 
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/12972) in GitLab 17.1 [with a flag](../../administration/feature_flags.md) named `ai_custom_model`. Disabled by default.
+
+FLAG:
+The availability of this feature is controlled by a feature flag.
+For more information, see the history.
+
 To configure your GitLab instance to access the available self-hosted large language
 models (LLMs) in your infrastructure:
 
diff --git a/doc/administration/self_hosted_models/index.md b/doc/administration/self_hosted_models/index.md
index 6c221424974..3045546a710 100644
--- a/doc/administration/self_hosted_models/index.md
+++ b/doc/administration/self_hosted_models/index.md
@@ -11,7 +11,11 @@ DETAILS:
 **Tier:** Premium, Ultimate
 **Offering:** Self-managed
 
-> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/12972) in GitLab 17.1 [behind the feature flag](../../administration/feature_flags.md) `ai_custom_model`. Disabled by default.
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/12972) in GitLab 17.1 [with a flag](../../administration/feature_flags.md) named `ai_custom_model`. Disabled by default.
+
+FLAG:
+The availability of this feature is controlled by a feature flag.
+For more information, see the history.
 
 Prerequisites:
 
diff --git a/doc/administration/self_hosted_models/install_infrastructure.md b/doc/administration/self_hosted_models/install_infrastructure.md
index e0425c37450..04453ab4d2f 100644
--- a/doc/administration/self_hosted_models/install_infrastructure.md
+++ b/doc/administration/self_hosted_models/install_infrastructure.md
@@ -11,6 +11,12 @@ DETAILS:
 **Tier:** Premium, Ultimate
 **Offering:** Self-managed
 
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/12972) in GitLab 17.1 [with a flag](../../administration/feature_flags.md) named `ai_custom_model`. Disabled by default.
+
+FLAG:
+The availability of this feature is controlled by a feature flag.
+For more information, see the history.
+
 By self-hosting the model, AI Gateway, and GitLab instance, there are no calls to external architecture, ensuring maximum levels of security.
 
 To set up your self-hosted model deployment infrastructure:
diff --git a/doc/api/code_suggestions.md b/doc/api/code_suggestions.md
index aa10b7729cf..9c31c5518d0 100644
--- a/doc/api/code_suggestions.md
+++ b/doc/api/code_suggestions.md
@@ -44,6 +44,7 @@ Parameters:
 | `intent`           | string  | no       | The intent of the completion request. This can be either `completion` or `generation`. |
 | `stream`           | boolean | no       | Whether to stream the response as smaller chunks as they are ready (if applicable). Default: `false`. |
 | `project_path`     | string  | no       | The path of the project. |
+| `generation_type`  | string  | no       | The type of event for generation requests. This can be `comment`, `empty_function`, or `small_file`. |
 | `context`          | array   | no       | Additional context to be used for Code Suggestions. See [Context attributes](#context-attributes) for a list of parameters this attribute accepts. |
 | `user_instruction` | string  | no       | A user's instructions for Code Suggestions. |
 
diff --git a/doc/integration/jira/configure.md b/doc/integration/jira/configure.md
index 8c054c64445..d706981d0ab 100644
--- a/doc/integration/jira/configure.md
+++ b/doc/integration/jira/configure.md
@@ -110,7 +110,8 @@ Prerequisites:
 - Ensure the Jira issue integration is [configured](#configure-the-integration)
   and the **View Jira issues** checkbox is selected.
 
-While Jira issues can be configured at the group and project level, Jira issues can only be viewed from the project level in GitLab. To view issues from one or more Jira projects in a GitLab project:
+You can enable Jira issues at the group or project level, but you can view the issues in GitLab projects only.
+To view issues from one or more Jira projects in a GitLab project:
 
 1. On the left sidebar, select **Search or go to** and find your project.
 1. Select **Plan > Jira issues**.
diff --git a/doc/integration/jira/troubleshooting.md b/doc/integration/jira/troubleshooting.md
index aaf91207dd8..701c9b5216e 100644
--- a/doc/integration/jira/troubleshooting.md
+++ b/doc/integration/jira/troubleshooting.md
@@ -252,24 +252,22 @@ Your Jira project key must not have [restricted words and characters](https://co
 
 ### Errors with Jira credentials
 
-When you try to view the Jira issue list in GitLab, you might see one of the following errors related to credentials:
+When you try to view the Jira issue list in GitLab, you might see one of the following errors.
 
-- `An error occurred while requesting data from Jira: The value '<project>' does not exist for the field 'project'. Check your Jira integration configuration and try again.`
-- `The credentials for accessing Jira are not allowed to access the data. Check your Jira integration credentials and try again.`
+#### `An error occurred while requesting data from Jira: The value '<project>' does not exist for the field 'project'. Check your Jira integration configuration and try again.`
 
-#### Error: `An error occurred while requesting data from Jira: The value '<project>' does not exist for the field 'project'. Check your Jira integration configuration and try again.`
+This error occurs when you use the wrong authentication credentials for your Jira installation:
 
-This error occurs when using the wrong authentication credential type based on the type of Jira installation:
+- **For Jira Cloud**, you must have a Jira Cloud API token
+  and the email address you used to create the token.
+- **For Jira Data Center or Jira Server**, you must have a Jira username and password,
+  or, in GitLab 16.0 and later, a Jira personal access token.
 
-- Jira Cloud requires an email and API token.
-- Jira Data Center and Server require a username and password combination.
+For more information, see [Jira issue integration](configure.md#configure-the-integration).
 
-For more information, see the [integration guide](configure.md#configure-the-integration).
+To resolve this issue, update the authentication credentials to match your Jira installation.
 
-To resolve this issue, update the authentication credentials to match the required authentication details for your type
-of Jira.
-
-#### Error: `The credentials for accessing Jira are not allowed to access the data. Check your Jira integration credentials and try again.`
+#### `The credentials for accessing Jira are not allowed to access the data. Check your Jira integration credentials and try again.`
 
 This error occurs when the Jira credentials cannot access the Jira project key you specified in the
 [Jira issue integration](configure.md#configure-the-integration).
diff --git a/doc/security/rate_limits.md b/doc/security/rate_limits.md
index 35d1507776a..8cab3db6808 100644
--- a/doc/security/rate_limits.md
+++ b/doc/security/rate_limits.md
@@ -87,6 +87,13 @@ For configuration information, see
 
 ## Non-configurable limits
 
+> - Rate limit on the `:user_id/status`, `:id/following`, `:id/followers`, `:user_id/keys`, `id/keys/:key_id`, `:id/gpg_keys`, and `:id/gpg_keys/:key_id` endpoints [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/452349) in GitLab 17.1 [with a flag](../administration/feature_flags.md) named `rate_limiting_user_endpoints`. Disabled by default.
+
+FLAG:
+The availability of multiple endpoints in this feature is controlled by a feature flag.
+For more information, see the history.
+These endpoints are available for testing, but not ready for production use.
+
 ### Repository archives
 
 A rate limit for [downloading repository archives](../api/repositories.md#get-file-archive) is
@@ -108,6 +115,48 @@ discover usernames or email addresses in use.
 
 The **rate limit** is 20 calls per minute per IP address.
 
+### User status
+
+There is a rate limit per IP address on the `:user_id/status` endpoint. This is to mitigate attempts to misuse the endpoint.
+
+The **rate limit** is 240 calls per minute per IP address.
+
+### User following
+
+There is a rate limit per IP address on the `:id/following` endpoint. This is to mitigate attempts to misuse the endpoint.
+
+The **rate limit** is 100 calls per minute per IP address.
+
+### User followers
+
+There is a rate limit per IP address on the `:id/followers` endpoint. This is to mitigate attempts to misuse the endpoint.
+
+The **rate limit** is 100 calls per minute per IP address.
+
+### User keys
+
+There is a rate limit per IP address on the `:user_id/keys` endpoint. This is to mitigate attempts to misuse the endpoint.
+
+The **rate limit** is 120 calls per minute per IP address.
+
+### User specific key
+
+There is a rate limit per IP address on the `id/keys/:key_id` endpoint. This is to mitigate attempts to misuse the endpoint.
+
+The **rate limit** is 120 calls per minute per IP address.
+
+### User GPG keys
+
+There is a rate limit per IP address on the `:id/gpg_keys` endpoint. This is to mitigate attempts to misuse the endpoint.
+
+The **rate limit** is 120 calls per minute per IP address.
+
+### User specific GPG keys
+
+There is a rate limit per IP address on the `:id/gpg_keys/:key_id` endpoint. This is to mitigate attempts to misuse the endpoint.
+
+The **rate limit** is 120 calls per minute per IP address.
+
 ### Update username
 
 There is a rate limit on how frequently a username can be changed. This is enforced to mitigate misuse of the feature. For example, to mass discover
diff --git a/doc/user/group/moderate_users.md b/doc/user/group/moderate_users.md
index e77ff05080f..d70443c2bad 100644
--- a/doc/user/group/moderate_users.md
+++ b/doc/user/group/moderate_users.md
@@ -6,13 +6,17 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Moderate users
 
+This section describes how to moderate users at the group level. For self-managed instances, see the [administration documentation](../../administration/moderate_users.md).
+
+If you have the Owner role for the group, to moderate user access you can [approve](manage.md#user-cap-for-groups), ban, or automatically remove dormant members.
+
+## Ban and unban users
+
 DETAILS:
 **Tier:** Ultimate
 **Offering:** GitLab.com
 
-> - [Introduced](https://gitlab.com/gitlab-org/modelops/anti-abuse/team-tasks/-/issues/155) in GitLab 15.8.
-
-This is the group-level documentation. For self-managed instances, see the [administration documentation](../../administration/moderate_users.md).
+> - [Introduced](https://gitlab.com/gitlab-org/modelops/anti-abuse/team-tasks/-/issues/155) in GitLab 15.8 [with a flag](../../administration/feature_flags.md) named `limit_unique_project_downloads_per_namespace_user`. Disabled by default.
 
 A group Owner can moderate user access by banning and unbanning users.
 You should ban a user when you want to block them from the group.
@@ -23,7 +27,7 @@ A banned user:
 - Cannot use [slash commands](../project/integrations/gitlab_slack_application.md#slash-commands).
 - Does not occupy a [seat](../free_user_limit.md).
 
-## Unban a user
+### Unban a user
 
 To unban a user with the GraphQL API, see [`Mutation.namespaceBanDestroy`](../../api/graphql/reference/index.md#mutationnamespacebandestroy).
 
@@ -41,7 +45,7 @@ To unban a user:
 1. Select the **Banned** tab.
 1. For the account you want to unban, select **Unban**.
 
-## Ban a user
+### Ban a user
 
 <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
 For a demo on banning a user at the group level, see [Namespace level ban - Banning a user](https://youtu.be/1rbi1uEJmOI).
@@ -57,3 +61,43 @@ To manually ban a user:
 1. On the left sidebar, select **Manage > Members**.
 1. Next to the member you want to ban, select the vertical ellipsis (**{ellipsis_v}**).
 1. From the dropdown list, select **Ban member**.
+
+## Automatically remove dormant members
+
+DETAILS:
+**Tier:** Free, Premium, Ultimate
+**Offering:** GitLab.com
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/461339) in GitLab 17.1 [with a flag](../../administration/feature_flags.md) named `group_remove_dormant_members`. Disabled by default.
+
+FLAG:
+The availability of this feature is controlled by a feature flag.
+For more information, see the history.
+This feature is available for testing, but not ready for production use.
+
+Prerequisites:
+
+- You must have the Owner role for the group.
+
+You can enable automatic removal of group members who either:
+
+- Were added to the group more than a week ago and have no activity in the group.
+- Have no activity in the group for a specified period of time. The default and minimum is 90 days. Activities involve:
+  - Git HTTP/SSH activities, such as `clone` and `push`.
+  - Visiting pages related to dashboards, projects, issues, merge requests, settings, and so on.
+  - Using the API in the scope of the group.
+  - Using the GraphQL API in the scope of the group.
+
+1. On the left sidebar, select **Search or go to** and find your group.
+1. On the left sidebar, select **Settings > General**.
+1. Expand **Permissions and group features**.
+1. Scroll to **Dormant members**.
+1. Select the **Remove dormant members after a period of inactivity** checkbox.
+1. In the **Days of inactivity before removal** field, enter the number of days before removal. The minimum is 90 days.
+1. Select **Save changes**.
+
+After the member has reached the days of inactivity and is removed from the group:
+
+- They still have access to GitLab.com.
+- They do not have access to the group.
+- Contributions made to the group are still assigned to the removed member.
diff --git a/doc/user/packages/container_registry/container_protection_rules.md b/doc/user/packages/container_registry/container_protection_rules.md
new file mode 100644
index 00000000000..85b7c93a566
--- /dev/null
+++ b/doc/user/packages/container_registry/container_protection_rules.md
@@ -0,0 +1,73 @@
+---
+stage: Container
+group: Container Registry
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
+---
+
+# Protected container repositories
+
+DETAILS:
+**Tier:** Free, Premium, Ultimate
+**Offering:** GitLab.com, Self-managed
+**Status:** Experiment
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/463669) in GitLab 16.7 [with a flag](../../../administration/feature_flags.md) named `containers_protected_containers`. Disabled by default. This feature is an [experiment](../../../policy/experiment-beta-support.md).
+
+FLAG:
+The availability of this feature is controlled by a feature flag.
+For more information, see the history.
+This feature is available for testing, but not ready for production use.
+
+By default, any user with at least the Developer role can push and delete
+container images to or from container repositories. Protect a container repository to restrict
+which users can make changes to container images in your container repository.
+
+When a container repository is protected, the default behavior enforces these restrictions on the container repository and its images:
+
+| Action                                                     | Minimum role         |
+|------------------------------------------------------------|----------------------|
+| Protect a container repository and its container images   | The Maintainer role. |
+| Push or create a new image in a container repository       | The role set in the [**Minimum access level for push**](#protect-a-container-repository-and-create-a-protection-rule) setting.   |
+| Push or update an existing image in a container repository | The role set in the [**Minimum access level for push**](#protect-a-container-repository-and-create-a-protection-rule) setting    |
+| Delete an existing image from a container repository       | The role set in the [**Minimum access level for delete**](#protect-a-container-repository-and-create-a-protection-rule) setting. |
+
+## Protect a container repository and create a protection rule
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/146523) in GitLab 16.10.
+
+Prerequisites:
+
+- You must have at least the Maintainer role.
+
+To protect a container repository:
+
+1. On the left sidebar, select **Search or go to** and find your project.
+1. Select **Settings > Packages and registries**.
+1. Under **Protected containers**, select **Add protection rule**.
+1. Complete the fields:
+   - **Repository path pattern** is a container repository path you want to protect.
+     The pattern can include a wildcard (`*`).
+   - **Minimum access level for push** describes the minimum access level required
+     to push (create or update) to the protected container repository path.
+   - **Minimum access level for delete** describes the minimum access level required
+     to delete from the protected container repository path.
+1. Select **Protect**.
+
+The container protection rule is created, and appears in the settings.
+
+## Delete a container protection rule and unprotect a container repository
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/146622) in GitLab 17.0.
+
+Prerequisites:
+
+- You must have at least the Maintainer role.
+
+To unprotect a container repository:
+
+1. On the left sidebar, select **Search or go to** and find your project.
+1. Select **Settings > Packages and registries**.
+1. Under **Protected containers**, next to the protection rule you want to delete, select **Delete** (**{remove}**).
+1. On the confirmation dialog, select **Delete**.
+
+The container protection rule is deleted, and does not appear in the settings.
diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md
index 102706f3d36..c836137fd3d 100644
--- a/doc/user/project/integrations/webhooks.md
+++ b/doc/user/project/integrations/webhooks.md
@@ -128,18 +128,13 @@ Custom headers appear in [**Recent events**](#view-webhook-request-history) with
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/142738) in GitLab 16.10 [with a flag](../../../administration/feature_flags.md) named `custom_webhook_template`. Enabled by default.
 > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/439610) in GitLab 17.0. Feature flag `custom_webhook_template` removed.
 
-You can set a custom payload template in the webhook configuration. The request body is rendered from the template
-with the data for the current event. The template must render as valid JSON.
+You can set a custom payload template in the webhook configuration.
+The request body is rendered from the template with data for the current event.
+The template must render as valid JSON.
 
-You can use any field from the [payload of any event](webhook_events.md), such as `{{build_name}}` for a job event and `{{deployable_url}}`
-for a deployment event. To access properties nested in objects, specify the path segments separated with `.`. For example:
-
-#### Known issue
-
-Custom webhook templates can't access properties in arrays. Support for accessing properties in arrays is proposed in
-[issue 463332](https://gitlab.com/gitlab-org/gitlab/-/issues/463332).
-
-#### Example
+You can use any field from the [payload of an event](webhook_events.md), such as
+`{{build_name}}` for a job event or `{{deployable_url}}` for a deployment event.
+To access properties nested in objects, specify the path segments separated by periods.
 
 Given this custom payload template:
 
@@ -150,7 +145,7 @@ Given this custom payload template:
 }
 ```
 
-You'll have this request payload that combines the template with a `push` event:
+The request payload combines the template with a `push` event:
 
 ```json
 {
@@ -159,6 +154,9 @@ You'll have this request payload that combines the template with a `push` event:
 }
 ```
 
+Custom webhook templates cannot access properties in arrays.
+Support for this feature is proposed in [issue 463332](https://gitlab.com/gitlab-org/gitlab/-/issues/463332).
+
 ### Filter push events by branch
 
 You can filter push events by branch. Use one of the following options to filter which push events are sent to your webhook endpoint:
diff --git a/doc/user/todos.md b/doc/user/todos.md
index 7e854b04bc4..1a38518a1b0 100644
--- a/doc/user/todos.md
+++ b/doc/user/todos.md
@@ -60,6 +60,8 @@ To change this behavior, enable
 [multiple to-do items per object](#multiple-to-do-items-per-object).
 
 To-do items aren't affected by [GitLab notification email settings](profile/notifications.md).
+The only exception: If your notification setting is set to **Custom** and **Added as approver** is
+selected, you get a to-do item when you are eligible to approve a merge request.
 
 ### Multiple to-do items per object
 
diff --git a/lib/api/users.rb b/lib/api/users.rb
index a27e44bcdd5..447d5aa4ac4 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -200,6 +200,13 @@ module API
         requires :user_id, type: String, desc: 'The ID or username of the user'
       end
       get ":user_id/status", requirements: API::USER_REQUIREMENTS, feature_category: :user_profile, urgency: :default do
+        if Feature.enabled?(:rate_limiting_user_endpoints, ::Feature.current_request)
+          check_rate_limit!(
+            :user_status,
+            scope: request.ip
+          )
+        end
+
         user = find_user(params[:user_id])
 
         not_found!('User') unless user && can?(current_user, :read_user, user)
@@ -260,6 +267,15 @@ module API
       get ':id/following', feature_category: :user_profile do
         forbidden!('Not authorized!') unless current_user
 
+        unless current_user.can_read_all_resources?
+          if Feature.enabled?(:rate_limiting_user_endpoints, ::Feature.current_request)
+            check_rate_limit!(
+              :user_following,
+              scope: request.ip
+            )
+          end
+        end
+
         user = find_user(params[:id])
         not_found!('User') unless user && can?(current_user, :read_user_profile, user)
 
@@ -276,6 +292,15 @@ module API
       get ':id/followers', feature_category: :user_profile do
         forbidden!('Not authorized!') unless current_user
 
+        unless current_user.can_read_all_resources?
+          if Feature.enabled?(:rate_limiting_user_endpoints, ::Feature.current_request)
+            check_rate_limit!(
+              :user_followers,
+              scope: request.ip
+            )
+          end
+        end
+
         user = find_user(params[:id])
         not_found!('User') unless user && can?(current_user, :read_user_profile, user)
 
@@ -484,6 +509,13 @@ module API
         use :pagination
       end
       get ':user_id/keys', requirements: API::USER_REQUIREMENTS, feature_category: :system_access do
+        if Feature.enabled?(:rate_limiting_user_endpoints, ::Feature.current_request)
+          check_rate_limit!(
+            :user_keys,
+            scope: request.ip
+          )
+        end
+
         user = find_user(params[:user_id])
         not_found!('User') unless user && can?(current_user, :read_user, user)
 
@@ -499,6 +531,13 @@ module API
         requires :key_id, type: Integer, desc: 'The ID of the SSH key'
       end
       get ':id/keys/:key_id', requirements: API::USER_REQUIREMENTS, feature_category: :system_access do
+        if Feature.enabled?(:rate_limiting_user_endpoints, ::Feature.current_request)
+          check_rate_limit!(
+            :user_specific_key,
+            scope: request.ip
+          )
+        end
+
         user = find_user(params[:id])
         not_found!('User') unless user && can?(current_user, :read_user, user)
 
@@ -567,6 +606,13 @@ module API
       end
       # rubocop: disable CodeReuse/ActiveRecord
       get ':id/gpg_keys', feature_category: :system_access do
+        if Feature.enabled?(:rate_limiting_user_endpoints, ::Feature.current_request)
+          check_rate_limit!(
+            :user_gpg_keys,
+            scope: request.ip
+          )
+        end
+
         user = User.find_by(id: params[:id])
         not_found!('User') unless user
 
@@ -584,6 +630,13 @@ module API
       end
       # rubocop: disable CodeReuse/ActiveRecord
       get ':id/gpg_keys/:key_id', feature_category: :system_access do
+        if Feature.enabled?(:rate_limiting_user_endpoints, ::Feature.current_request)
+          check_rate_limit!(
+            :user_specific_gpg_key,
+            scope: request.ip
+          )
+        end
+
         user = User.find_by(id: params[:id])
         not_found!('User') unless user
 
diff --git a/lib/gitlab/application_rate_limiter.rb b/lib/gitlab/application_rate_limiter.rb
index 327ab288c99..6a8540ce06a 100644
--- a/lib/gitlab/application_rate_limiter.rb
+++ b/lib/gitlab/application_rate_limiter.rb
@@ -44,6 +44,13 @@ module Gitlab
           web_hook_test: { threshold: 5, interval: 1.minute },
           users_get_by_id: { threshold: -> { application_settings.users_get_by_id_limit }, interval: 10.minutes },
           username_exists: { threshold: 20, interval: 1.minute },
+          user_followers: { threshold: 100, interval: 1.minute },
+          user_following: { threshold: 100, interval: 1.minute },
+          user_status: { threshold: 240, interval: 1.minute },
+          user_keys: { threshold: 120, interval: 1.minute },
+          user_specific_key: { threshold: 120, interval: 1.minute },
+          user_gpg_keys: { threshold: 120, interval: 1.minute },
+          user_specific_gpg_key: { threshold: 120, interval: 1.minute },
           user_sign_up: { threshold: 20, interval: 1.minute },
           user_sign_in: { threshold: 5, interval: 10.minutes },
           profile_resend_email_confirmation: { threshold: 5, interval: 1.minute },
diff --git a/lib/gitlab/background_migration/.rubocop.yml b/lib/gitlab/background_migration/.rubocop.yml
index e9d54ca3359..473b1ae854c 100644
--- a/lib/gitlab/background_migration/.rubocop.yml
+++ b/lib/gitlab/background_migration/.rubocop.yml
@@ -45,7 +45,7 @@ Style/FrozenStringLiteralComment:
   Details: >-
     This removes the need for calling "freeze", reducing noise in the code.
 
-Migration/BackgroundMigrationBaseClass:
+Migration/BatchedMigrationBaseClass:
   Enabled: true
   Exclude:
     - 'batching_strategies/**/*.rb'
diff --git a/lib/gitlab/background_migration/backfill_agent_activity_events_agent_project_id.rb b/lib/gitlab/background_migration/backfill_agent_activity_events_agent_project_id.rb
index 8e04feb9bd5..52b7ff3ce51 100644
--- a/lib/gitlab/background_migration/backfill_agent_activity_events_agent_project_id.rb
+++ b/lib/gitlab/background_migration/backfill_agent_activity_events_agent_project_id.rb
@@ -2,11 +2,9 @@
 
 module Gitlab
   module BackgroundMigration
-    # rubocop: disable Migration/BackgroundMigrationBaseClass -- BackfillDesiredShardingKeyJob inherits from BatchedMigrationJob.
     class BackfillAgentActivityEventsAgentProjectId < BackfillDesiredShardingKeyJob
       operation_name :backfill_agent_activity_events_agent_project_id
       feature_category :deployment_management
     end
-    # rubocop: enable Migration/BackgroundMigrationBaseClass
   end
 end
diff --git a/lib/gitlab/background_migration/backfill_boards_epic_user_preferences_group_id.rb b/lib/gitlab/background_migration/backfill_boards_epic_user_preferences_group_id.rb
index 7af9cdad5f6..8a42d6ff438 100644
--- a/lib/gitlab/background_migration/backfill_boards_epic_user_preferences_group_id.rb
+++ b/lib/gitlab/background_migration/backfill_boards_epic_user_preferences_group_id.rb
@@ -2,11 +2,9 @@
 
 module Gitlab
   module BackgroundMigration
-    # rubocop: disable Migration/BackgroundMigrationBaseClass -- BackfillDesiredShardingKeyJob inherits from BatchedMigrationJob.
     class BackfillBoardsEpicUserPreferencesGroupId < BackfillDesiredShardingKeyJob
       operation_name :backfill_boards_epic_user_preferences_group_id
       feature_category :portfolio_management
     end
-    # rubocop: enable Migration/BackgroundMigrationBaseClass
   end
 end
diff --git a/lib/gitlab/background_migration/backfill_design_management_versions_namespace_id.rb b/lib/gitlab/background_migration/backfill_design_management_versions_namespace_id.rb
index cbb9dc45bee..1ff936b3417 100644
--- a/lib/gitlab/background_migration/backfill_design_management_versions_namespace_id.rb
+++ b/lib/gitlab/background_migration/backfill_design_management_versions_namespace_id.rb
@@ -2,11 +2,9 @@
 
 module Gitlab
   module BackgroundMigration
-    # rubocop: disable Migration/BackgroundMigrationBaseClass -- BackfillDesiredShardingKeyJob inherits from BatchedMigrationJob.
     class BackfillDesignManagementVersionsNamespaceId < BackfillDesiredShardingKeyJob
       operation_name :backfill_design_management_versions_namespace_id
       feature_category :design_management
     end
-    # rubocop: enable Migration/BackgroundMigrationBaseClass
   end
 end
diff --git a/lib/gitlab/background_migration/backfill_dora_daily_metrics_project_id.rb b/lib/gitlab/background_migration/backfill_dora_daily_metrics_project_id.rb
index aa824cc60a1..88a6781b957 100644
--- a/lib/gitlab/background_migration/backfill_dora_daily_metrics_project_id.rb
+++ b/lib/gitlab/background_migration/backfill_dora_daily_metrics_project_id.rb
@@ -2,11 +2,9 @@
 
 module Gitlab
   module BackgroundMigration
-    # rubocop: disable Migration/BackgroundMigrationBaseClass -- BackfillDesiredShardingKeyJob inherits from BatchedMigrationJob.
     class BackfillDoraDailyMetricsProjectId < BackfillDesiredShardingKeyJob
       operation_name :backfill_dora_daily_metrics_project_id
       feature_category :continuous_delivery
     end
-    # rubocop: enable Migration/BackgroundMigrationBaseClass
   end
 end
diff --git a/lib/gitlab/background_migration/backfill_draft_status_on_merge_requests_with_corrected_regex.rb b/lib/gitlab/background_migration/backfill_draft_status_on_merge_requests_with_corrected_regex.rb
index 2d64b7378be..ad156a52e86 100644
--- a/lib/gitlab/background_migration/backfill_draft_status_on_merge_requests_with_corrected_regex.rb
+++ b/lib/gitlab/background_migration/backfill_draft_status_on_merge_requests_with_corrected_regex.rb
@@ -5,7 +5,7 @@ module Gitlab
     # Backfill draft column on open merge requests based on regex parsing of
     #   their titles.
     #
-    class BackfillDraftStatusOnMergeRequestsWithCorrectedRegex # rubocop:disable Migration/BackgroundMigrationBaseClass
+    class BackfillDraftStatusOnMergeRequestsWithCorrectedRegex # rubocop:disable Migration/BatchedMigrationBaseClass
       # Migration only version of MergeRequest table
       class MergeRequest < ::ApplicationRecord
         include EachBatch
diff --git a/lib/gitlab/background_migration/backfill_remote_development_agent_configs_project_id.rb b/lib/gitlab/background_migration/backfill_remote_development_agent_configs_project_id.rb
index 33f493fab47..84c8664d244 100644
--- a/lib/gitlab/background_migration/backfill_remote_development_agent_configs_project_id.rb
+++ b/lib/gitlab/background_migration/backfill_remote_development_agent_configs_project_id.rb
@@ -2,11 +2,9 @@
 
 module Gitlab
   module BackgroundMigration
-    # rubocop: disable Migration/BackgroundMigrationBaseClass -- BackfillDesiredShardingKeyJob inherits from BatchedMigrationJob.
     class BackfillRemoteDevelopmentAgentConfigsProjectId < BackfillDesiredShardingKeyJob
       operation_name :backfill_remote_development_agent_configs_project_id
       feature_category :remote_development
     end
-    # rubocop: enable Migration/BackgroundMigrationBaseClass
   end
 end
diff --git a/lib/gitlab/background_migration/backfill_wiki_page_slugs_project_id.rb b/lib/gitlab/background_migration/backfill_wiki_page_slugs_project_id.rb
index 3c5e7417503..a741fb0b7bc 100644
--- a/lib/gitlab/background_migration/backfill_wiki_page_slugs_project_id.rb
+++ b/lib/gitlab/background_migration/backfill_wiki_page_slugs_project_id.rb
@@ -2,11 +2,9 @@
 
 module Gitlab
   module BackgroundMigration
-    # rubocop: disable Migration/BackgroundMigrationBaseClass -- BackfillDesiredShardingKeyJob inherits from BatchedMigrationJob.
     class BackfillWikiPageSlugsProjectId < BackfillDesiredShardingKeyJob
       operation_name :backfill_wiki_page_slugs_project_id
       feature_category :wiki
     end
-    # rubocop: enable Migration/BackgroundMigrationBaseClass
   end
 end
diff --git a/lib/gitlab/background_migration/purge_stale_security_scans.rb b/lib/gitlab/background_migration/purge_stale_security_scans.rb
index 6b6847f0439..81152295d1c 100644
--- a/lib/gitlab/background_migration/purge_stale_security_scans.rb
+++ b/lib/gitlab/background_migration/purge_stale_security_scans.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module BackgroundMigration
     # rubocop:disable Style/Documentation
-    class PurgeStaleSecurityScans # rubocop:disable Migration/BackgroundMigrationBaseClass
+    class PurgeStaleSecurityScans # rubocop:disable Migration/BatchedMigrationBaseClass
       class SecurityScan < ::ApplicationRecord
         include EachBatch
 
diff --git a/lib/gitlab/background_migration/re_expire_o_auth_tokens.rb b/lib/gitlab/background_migration/re_expire_o_auth_tokens.rb
index c327b14669d..ce937aff513 100644
--- a/lib/gitlab/background_migration/re_expire_o_auth_tokens.rb
+++ b/lib/gitlab/background_migration/re_expire_o_auth_tokens.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module BackgroundMigration
     # rubocop: disable Style/Documentation
-    class ReExpireOAuthTokens < Gitlab::BackgroundMigration::ExpireOAuthTokens # rubocop:disable Migration/BackgroundMigrationBaseClass
+    class ReExpireOAuthTokens < Gitlab::BackgroundMigration::ExpireOAuthTokens # rubocop:disable Migration/BatchedMigrationBaseClass
     end
     # rubocop: enable Style/Documentation
   end
diff --git a/lib/gitlab/background_migration/redis/backfill_project_pipeline_status_ttl.rb b/lib/gitlab/background_migration/redis/backfill_project_pipeline_status_ttl.rb
index 7886abdb6d4..3363037c2e7 100644
--- a/lib/gitlab/background_migration/redis/backfill_project_pipeline_status_ttl.rb
+++ b/lib/gitlab/background_migration/redis/backfill_project_pipeline_status_ttl.rb
@@ -7,7 +7,7 @@ module Gitlab
       # Gitlab::Cache::Ci::ProjectPipelineStatus by adding a minimum 8-hour ttl
       # to all keys. This either sets or extends the ttl of matching keys.
       #
-      class BackfillProjectPipelineStatusTtl # rubocop:disable Migration/BackgroundMigrationBaseClass
+      class BackfillProjectPipelineStatusTtl # rubocop:disable Migration/BatchedMigrationBaseClass
         def perform(keys)
           # spread out deletes over a 4 hour period starting in 8 hours time
           ttl_duration = 10.hours.to_i
diff --git a/lib/gitlab/ci/ansi2html.rb b/lib/gitlab/ci/ansi2html.rb
index d581fbfda42..8c180062d62 100644
--- a/lib/gitlab/ci/ansi2html.rb
+++ b/lib/gitlab/ci/ansi2html.rb
@@ -6,6 +6,16 @@
 module Gitlab
   module Ci
     module Ansi2html
+      # Timestamp line prefix format:
+      # <timestamp> <stream number><stream type><full line type>
+      # - timestamp: UTC RFC3339 timestamp
+      # - stream number: 1 byte (2 hex chars) stream number
+      # - stream type: E/O (Err or Out)
+      # - full line type: `+` if line is continuation of previous line, ` ` otherwise
+      TIMESTAMP_REGEX = /(\d{4}-[01][0-9]-[0-3][0-9]T[0-2][0-9]:[0-5][0-9]:[0-5][0-9]\.[0-9]{6}Z) [0-9a-f]{2}[EO][+ ]/
+      RFC3339_DATETIME_LENGTH = 27
+      TIMESTAMP_PREFIX_LENGTH = RFC3339_DATETIME_LENGTH + 5
+
       # keys represent the trailing digit in color changing command (30-37, 40-47, 90-97. 100-107)
       COLOR = {
         0 => 'black', # not that this is gray in the intense color table
@@ -35,6 +45,374 @@ module Gitlab
       class Converter
         include EncodingHelper
 
+        STATE_PARAMS = [:offset, :n_open_tags, :fg_color, :bg_color, :style_mask, :sections, :lineno_in_section].freeze
+
+        def convert(stream, new_state)
+          reset_state
+          restore_state(new_state, stream) if new_state.present?
+
+          append = false
+          truncated = false
+
+          cur_offset = stream.tell
+          if cur_offset > @offset
+            @offset = cur_offset
+            truncated = true
+          else
+            stream.seek(@offset)
+            append = @offset > 0
+          end
+
+          start_offset = @offset
+
+          process_stream_with_lookahead(stream)
+
+          Ansi2html::Result.new(
+            html: @out.force_encoding(Encoding.default_external),
+            state: state,
+            append: append,
+            truncated: truncated,
+            offset: start_offset,
+            size: stream.tell - start_offset,
+            total: stream.size
+          )
+        end
+
+        def section_to_class_name(section)
+          section.to_s.downcase.gsub(/[^a-z0-9]/, '-')
+        end
+
+        private
+
+        attr_accessor :offset, :n_open_tags, :fg_color, :bg_color, :style_mask, :sections, :lineno_in_section
+
+        def process_stream_with_lookahead(stream)
+          if Feature.disabled?(:parse_ci_job_timestamps, Feature.current_request)
+            # Legacy logic
+            stream.each_line do |line|
+              line = encode_utf8_no_detect(line)
+              consume_line(line)
+            end
+
+            close_open_tags
+            return
+          end
+
+          # We process lines with 1-line look-back, so that we can process line continuations
+          previous_line = nil
+
+          stream.each_line do |line|
+            line = encode_utf8_no_detect(line)
+            handle_line(previous_line, line)
+            previous_line = line
+          end
+
+          handle_line(previous_line, nil) if previous_line
+
+          close_open_tags
+        end
+
+        def handle_line(line, next_line)
+          if line.nil?
+            # First line, initialize check for timestamps
+            @has_timestamps = next_line.match?(TIMESTAMP_REGEX)
+            return
+          end
+
+          is_continued =
+            @has_timestamps && next_line&.at(TIMESTAMP_PREFIX_LENGTH - 1) == '+' && has_timestamp_prefix?(next_line)
+
+          # Continued lines contain an ignored \n character at the end, so we can chop it off
+          line.delete_suffix!("\n") if is_continued
+
+          if @current_line_buffer.nil?
+            @current_line_buffer = line
+          else
+            # Ignore timestamp from continued line
+            @current_line_buffer << line[TIMESTAMP_PREFIX_LENGTH..]
+          end
+
+          return if is_continued
+
+          consume_line(@current_line_buffer)
+          @current_line_buffer = nil
+        end
+
+        def consume_line(line)
+          scanner = StringScanner.new(line)
+          last_offset = nil
+          line_start_offset = @offset
+
+          # Consume tokens until end of string or no more progress
+          until scanner.eos? || @offset == last_offset
+            last_offset = @offset
+            consume_token(scanner, @offset == line_start_offset)
+          end
+        end
+
+        def consume_token(scanner, at_line_start)
+          return if at_line_start && skip_timestamp(scanner) # Avoid regex on timestamps
+
+          if scanner.scan(Gitlab::Regex.build_trace_section_regex)
+            handle_section(scanner)
+          elsif scanner.scan(/\e([@-_])(.*?)([@-~])/)
+            handle_sequence(scanner)
+          elsif scanner.scan(/\e(?:[@-_].*?)?$/)
+            return
+          elsif scanner.scan('<')
+            write_in_tag '&lt;'
+          elsif scanner.scan(/\r?\n/)
+            handle_new_line
+          else
+            write_in_tag scanner.scan(/./m)
+          end
+
+          @offset += scanner.matched_size
+        end
+
+        def has_timestamp_prefix?(line)
+          # Avoid regex on timestamps for performance
+          return unless @has_timestamps && line && line.length >= TIMESTAMP_PREFIX_LENGTH
+
+          line[RFC3339_DATETIME_LENGTH - 1] == 'Z' &&
+            line[4] == '-' && line[7] == '-' && line[10] == 'T' && line[13] == ':'
+        end
+
+        def skip_timestamp(scanner)
+          return unless @has_timestamps
+
+          line = scanner.peek(TIMESTAMP_PREFIX_LENGTH + 1)
+          return unless has_timestamp_prefix?(line)
+
+          scanner.pos += TIMESTAMP_PREFIX_LENGTH
+          @offset += TIMESTAMP_PREFIX_LENGTH
+        end
+
+        def handle_new_line
+          write_in_tag %(<br/>)
+
+          close_open_tags if @sections.any? && @lineno_in_section == 0
+          @lineno_in_section += 1
+        end
+
+        def handle_section(scanner)
+          action = scanner[1]
+          timestamp = scanner[2]
+          section = scanner[3]
+
+          normalized_section = section_to_class_name(section)
+
+          case action
+          when 'start'
+            handle_section_start(normalized_section, timestamp)
+          when 'end'
+            handle_section_end(normalized_section, timestamp)
+          end
+        end
+
+        def handle_section_start(section, timestamp)
+          return if @sections.include?(section)
+
+          @sections << section
+          write_raw %(<div class="section-start" data-timestamp="#{timestamp}" data-section="#{data_section_names}" role="button"></div>)
+          @lineno_in_section = 0
+        end
+
+        def handle_section_end(section, timestamp)
+          return unless @sections.include?(section)
+
+          # close all sections up to section
+          until @sections.empty?
+            write_raw %(<div class="section-end" data-section="#{data_section_names}"></div>)
+
+            last_section = @sections.pop
+            break if section == last_section
+          end
+        end
+
+        def data_section_names
+          @sections.join(' ')
+        end
+
+        def handle_sequence(scanner)
+          indicator = scanner[1]
+          terminator = scanner[3]
+
+          # We are only interested in color and text style changes - triggered by
+          # sequences starting with '\e[' and ending with 'm'. Any other control
+          # sequence gets stripped (including stuff like "delete last line")
+          return unless indicator == '[' && terminator == 'm'
+
+          close_open_tags
+
+          commands = scanner[2].split ';'
+          if commands.empty?
+            reset
+            return
+          end
+
+          evaluate_command_stack(commands)
+        end
+
+        def evaluate_command_stack(stack)
+          return unless command = stack.shift
+
+          if self.respond_to?("on_#{command}", true)
+            self.__send__("on_#{command}", stack) # rubocop:disable GitlabSecurity/PublicSend
+          end
+
+          evaluate_command_stack(stack)
+        end
+
+        def write_in_tag(data)
+          ensure_open_new_tag
+          @out << data
+        end
+
+        def write_raw(data)
+          close_open_tags
+          @out << data
+        end
+
+        def ensure_open_new_tag
+          open_new_tag if @n_open_tags == 0
+        end
+
+        def open_new_tag
+          css_classes = []
+
+          unless @fg_color.nil?
+            fg_color = @fg_color
+            # Most terminals show bold colored text in the light color variant
+            # Let's mimic that here
+            if @style_mask & STYLE_SWITCHES[:bold] != 0
+              fg_color.sub!(/fg-([a-z]{2,}+)/, 'fg-l-\1')
+            end
+
+            css_classes << fg_color
+          end
+
+          css_classes << @bg_color unless @bg_color.nil?
+
+          STYLE_SWITCHES.each do |css_class, flag|
+            css_classes << "term-#{css_class}" if @style_mask & flag != 0
+          end
+
+          if @sections.any?
+            css_classes << 'section'
+
+            css_classes << if @lineno_in_section == 0
+                             'section-header'
+                           else
+                             'line'
+                           end
+
+            css_classes += sections.map { |section| "js-s-#{section}" }
+          end
+
+          close_open_tags
+
+          @out << if css_classes.any?
+                    %(<span class="#{css_classes.join(' ')}">)
+                  else
+                    %(<span>)
+                  end
+
+          @n_open_tags += 1
+        end
+
+        def close_open_tags
+          while @n_open_tags > 0
+            @out << %(</span>)
+            @n_open_tags -= 1
+          end
+        end
+
+        def reset_state
+          @offset = 0
+          @n_open_tags = 0
+          @out = +''
+          @sections = []
+          @lineno_in_section = 0
+          @current_line_buffer = nil
+          @has_timestamps = nil
+          reset
+        end
+
+        def state
+          state = STATE_PARAMS.index_with do |param|
+            send(param) # rubocop:disable GitlabSecurity/PublicSend
+          end
+          Base64.urlsafe_encode64(state.to_json)
+        end
+
+        def restore_state(new_state, stream)
+          state = Base64.urlsafe_decode64(new_state)
+          state = Gitlab::Json.parse(state, symbolize_names: true)
+          return if state[:offset].to_i > stream.size
+
+          STATE_PARAMS.each do |param|
+            send("#{param}=".to_sym, state[param]) # rubocop:disable GitlabSecurity/PublicSend
+          end
+        end
+
+        def reset
+          @fg_color = nil
+          @bg_color = nil
+          @style_mask = 0
+        end
+
+        def enable(flag)
+          @style_mask |= flag
+        end
+
+        def disable(flag)
+          @style_mask &= ~flag
+        end
+
+        def set_fg_color(color_index, prefix = nil)
+          @fg_color = get_term_color_class(color_index, ["fg", prefix])
+        end
+
+        def set_bg_color(color_index, prefix = nil)
+          @bg_color = get_term_color_class(color_index, ["bg", prefix])
+        end
+
+        def get_term_color_class(color_index, prefix)
+          color_name = COLOR[color_index]
+          return if color_name.nil?
+
+          get_color_class(["term", prefix, color_name])
+        end
+
+        def set_fg_color_256(command_stack)
+          css_class = get_xterm_color_class(command_stack, "fg")
+          @fg_color = css_class unless css_class.nil?
+        end
+
+        def set_bg_color_256(command_stack)
+          css_class = get_xterm_color_class(command_stack, "bg")
+          @bg_color = css_class unless css_class.nil?
+        end
+
+        def get_xterm_color_class(command_stack, prefix)
+          # the 38 and 48 commands have to be followed by "5" and the color index
+          return unless command_stack.length >= 2
+          return unless command_stack[0] == "5"
+
+          command_stack.shift # ignore the "5" command
+          color_index = command_stack.shift.to_i
+
+          return unless color_index >= 0
+          return unless color_index <= 255
+
+          get_color_class(["xterm", prefix, color_index])
+        end
+
+        def get_color_class(segments)
+          [segments].flatten.compact.join('-')
+        end
+
         def on_0(_)
           reset
         end
@@ -234,292 +612,6 @@ module Gitlab
         def on_109(_)
           set_bg_color(9, 'l')
         end
-
-        attr_accessor :offset, :n_open_tags, :fg_color, :bg_color, :style_mask, :sections, :lineno_in_section
-
-        STATE_PARAMS = [:offset, :n_open_tags, :fg_color, :bg_color, :style_mask, :sections, :lineno_in_section].freeze
-
-        def convert(stream, new_state)
-          reset_state
-          restore_state(new_state, stream) if new_state.present?
-
-          append = false
-          truncated = false
-
-          cur_offset = stream.tell
-          if cur_offset > @offset
-            @offset = cur_offset
-            truncated = true
-          else
-            stream.seek(@offset)
-            append = @offset > 0
-          end
-
-          start_offset = @offset
-
-          stream.each_line do |line|
-            line = encode_utf8_no_detect(line)
-            s = StringScanner.new(line)
-
-            until s.eos?
-
-              if s.scan(Gitlab::Regex.build_trace_section_regex)
-                handle_section(s)
-              elsif s.scan(/\e([@-_])(.*?)([@-~])/)
-                handle_sequence(s)
-              elsif s.scan(/\e(([@-_])(.*?)?)?$/)
-                break
-              elsif s.scan(/</)
-                write_in_tag '&lt;'
-              elsif s.scan(/\r?\n/)
-                handle_new_line
-              else
-                write_in_tag s.scan(/./m)
-              end
-
-              @offset += s.matched_size
-            end
-          end
-
-          close_open_tags
-
-          Ansi2html::Result.new(
-            html: @out.force_encoding(Encoding.default_external),
-            state: state,
-            append: append,
-            truncated: truncated,
-            offset: start_offset,
-            size: stream.tell - start_offset,
-            total: stream.size
-          )
-        end
-
-        def section_to_class_name(section)
-          section.to_s.downcase.gsub(/[^a-z0-9]/, '-')
-        end
-
-        def handle_new_line
-          write_in_tag %(<br/>)
-
-          close_open_tags if @sections.any? && @lineno_in_section == 0
-          @lineno_in_section += 1
-        end
-
-        def handle_section(scanner)
-          action = scanner[1]
-          timestamp = scanner[2]
-          section = scanner[3]
-
-          normalized_section = section_to_class_name(section)
-
-          case action
-          when "start"
-            handle_section_start(normalized_section, timestamp)
-          when "end"
-            handle_section_end(normalized_section, timestamp)
-          end
-        end
-
-        def handle_section_start(section, timestamp)
-          return if @sections.include?(section)
-
-          @sections << section
-          write_raw %(<div class="section-start" data-timestamp="#{timestamp}" data-section="#{data_section_names}" role="button"></div>)
-          @lineno_in_section = 0
-        end
-
-        def handle_section_end(section, timestamp)
-          return unless @sections.include?(section)
-
-          # close all sections up to section
-          until @sections.empty?
-            write_raw %(<div class="section-end" data-section="#{data_section_names}"></div>)
-
-            last_section = @sections.pop
-            break if section == last_section
-          end
-        end
-
-        def data_section_names
-          @sections.join(" ")
-        end
-
-        def handle_sequence(scanner)
-          indicator = scanner[1]
-          commands = scanner[2].split ';'
-          terminator = scanner[3]
-
-          # We are only interested in color and text style changes - triggered by
-          # sequences starting with '\e[' and ending with 'm'. Any other control
-          # sequence gets stripped (including stuff like "delete last line")
-          return unless indicator == '[' && terminator == 'm'
-
-          close_open_tags
-
-          if commands.empty?
-            reset
-            return
-          end
-
-          evaluate_command_stack(commands)
-        end
-
-        def evaluate_command_stack(stack)
-          return unless command = stack.shift
-
-          if self.respond_to?("on_#{command}", true)
-            self.__send__("on_#{command}", stack) # rubocop:disable GitlabSecurity/PublicSend
-          end
-
-          evaluate_command_stack(stack)
-        end
-
-        def write_in_tag(data)
-          ensure_open_new_tag
-          @out << data
-        end
-
-        def write_raw(data)
-          close_open_tags
-          @out << data
-        end
-
-        def ensure_open_new_tag
-          open_new_tag if @n_open_tags == 0
-        end
-
-        def open_new_tag
-          css_classes = []
-
-          unless @fg_color.nil?
-            fg_color = @fg_color
-            # Most terminals show bold colored text in the light color variant
-            # Let's mimic that here
-            if @style_mask & STYLE_SWITCHES[:bold] != 0
-              fg_color.sub!(/fg-([a-z]{2,}+)/, 'fg-l-\1')
-            end
-
-            css_classes << fg_color
-          end
-
-          css_classes << @bg_color unless @bg_color.nil?
-
-          STYLE_SWITCHES.each do |css_class, flag|
-            css_classes << "term-#{css_class}" if @style_mask & flag != 0
-          end
-
-          if @sections.any?
-            css_classes << "section"
-
-            css_classes << if @lineno_in_section == 0
-                             "section-header"
-                           else
-                             "line"
-                           end
-
-            css_classes += sections.map { |section| "js-s-#{section}" }
-          end
-
-          close_open_tags
-
-          @out << if css_classes.any?
-                    %(<span class="#{css_classes.join(' ')}">)
-                  else
-                    %(<span>)
-                  end
-
-          @n_open_tags += 1
-        end
-
-        def close_open_tags
-          while @n_open_tags > 0
-            @out << %(</span>)
-            @n_open_tags -= 1
-          end
-        end
-
-        def reset_state
-          @offset = 0
-          @n_open_tags = 0
-          @out = +''
-          @sections = []
-          @lineno_in_section = 0
-          reset
-        end
-
-        def state
-          state = STATE_PARAMS.index_with do |param|
-            send(param) # rubocop:disable GitlabSecurity/PublicSend
-          end
-          Base64.urlsafe_encode64(state.to_json)
-        end
-
-        def restore_state(new_state, stream)
-          state = Base64.urlsafe_decode64(new_state)
-          state = Gitlab::Json.parse(state, symbolize_names: true)
-          return if state[:offset].to_i > stream.size
-
-          STATE_PARAMS.each do |param|
-            send("#{param}=".to_sym, state[param]) # rubocop:disable GitlabSecurity/PublicSend
-          end
-        end
-
-        def reset
-          @fg_color = nil
-          @bg_color = nil
-          @style_mask = 0
-        end
-
-        def enable(flag)
-          @style_mask |= flag
-        end
-
-        def disable(flag)
-          @style_mask &= ~flag
-        end
-
-        def set_fg_color(color_index, prefix = nil)
-          @fg_color = get_term_color_class(color_index, ["fg", prefix])
-        end
-
-        def set_bg_color(color_index, prefix = nil)
-          @bg_color = get_term_color_class(color_index, ["bg", prefix])
-        end
-
-        def get_term_color_class(color_index, prefix)
-          color_name = COLOR[color_index]
-          return if color_name.nil?
-
-          get_color_class(["term", prefix, color_name])
-        end
-
-        def set_fg_color_256(command_stack)
-          css_class = get_xterm_color_class(command_stack, "fg")
-          @fg_color = css_class unless css_class.nil?
-        end
-
-        def set_bg_color_256(command_stack)
-          css_class = get_xterm_color_class(command_stack, "bg")
-          @bg_color = css_class unless css_class.nil?
-        end
-
-        def get_xterm_color_class(command_stack, prefix)
-          # the 38 and 48 commands have to be followed by "5" and the color index
-          return unless command_stack.length >= 2
-          return unless command_stack[0] == "5"
-
-          command_stack.shift # ignore the "5" command
-          color_index = command_stack.shift.to_i
-
-          return unless color_index >= 0
-          return unless color_index <= 255
-
-          get_color_class(["xterm", prefix, color_index])
-        end
-
-        def get_color_class(segments)
-          [segments].flatten.compact.join('-')
-        end
       end
     end
   end
diff --git a/lib/gitlab/internal_events.rb b/lib/gitlab/internal_events.rb
index 8d86d0ec286..f2086ce416a 100644
--- a/lib/gitlab/internal_events.rb
+++ b/lib/gitlab/internal_events.rb
@@ -56,19 +56,6 @@ module Gitlab
         nil
       end
 
-      def convert_event_selection_rule_to_path_part(event_selection_rule)
-        path = event_selection_rule[:name]
-
-        if event_selection_rule[:filter].present?
-          filter = event_selection_rule[:filter]
-          sorted_filter_keys = filter.keys.sort
-          serialized_filter = sorted_filter_keys.map { |key| "#{key}:#{filter[key]}" }.join(',')
-          path = "#{path}-filter:[#{serialized_filter}]"
-        end
-
-        path
-      end
-
       private
 
       def validate_properties!(additional_properties, kwargs)
@@ -108,23 +95,14 @@ module Gitlab
         return unless event_definition
 
         event_definition.event_selection_rules.each do |event_selection_rule|
-          matches_filter = event_selection_rule[:filter].all? do |property_name, value|
+          matches_filter = event_selection_rule.filter.all? do |property_name, value|
             additional_properties[property_name] == value
           end
 
           next unless matches_filter
 
-          event_specific_part_of_path = convert_event_selection_rule_to_path_part(event_selection_rule)
-
-          if event_selection_rule[:time_framed?]
-            redis_key = Gitlab::Usage::Metrics::Instrumentations::TotalCountMetric.redis_key(
-              event_specific_part_of_path,
-              Date.today
-            )
-            increment(redis_key, expiry: 6.weeks)
-          else
-            increment(Gitlab::Usage::Metrics::Instrumentations::TotalCountMetric.redis_key(event_specific_part_of_path))
-          end
+          expiry = event_selection_rule.time_framed? ? 6.weeks : nil
+          increment(event_selection_rule.redis_key_for_date, expiry: expiry)
         end
       end
 
diff --git a/lib/gitlab/tracking/event_definition.rb b/lib/gitlab/tracking/event_definition.rb
index fa880e41e4b..e8a6556e4a7 100644
--- a/lib/gitlab/tracking/event_definition.rb
+++ b/lib/gitlab/tracking/event_definition.rb
@@ -86,12 +86,12 @@ module Gitlab
 
       def find_event_selection_rules
         result = [
-          { name: attributes[:action], time_framed?: false, filter: {} },
-          { name: attributes[:action], time_framed?: true, filter: {} }
+          Gitlab::Usage::EventSelectionRule.new(name: attributes[:action], time_framed: false),
+          Gitlab::Usage::EventSelectionRule.new(name: attributes[:action], time_framed: true)
         ]
         Gitlab::Usage::MetricDefinition.definitions.each_value do |metric_definition|
           matching_event_selection_rules = metric_definition.event_selection_rules.select do |event_selection_rule|
-            event_selection_rule[:name] == attributes[:action]
+            event_selection_rule.name == attributes[:action]
           end
           result.concat(matching_event_selection_rules)
         end
diff --git a/lib/gitlab/usage/event_selection_rule.rb b/lib/gitlab/usage/event_selection_rule.rb
new file mode 100644
index 00000000000..e0bc01f6d30
--- /dev/null
+++ b/lib/gitlab/usage/event_selection_rule.rb
@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+#   Represents the relationship between a event definition and a metric definition.
+#
+#   Example usages:
+#   EventSelectionRule.new('pull_package', time_framed: true, filter: { label: 'rubygems' })
+#
+#   The above rule represents a defines a metric that "counts weekly number of pull_package events with label rubygems"
+#
+#   EventSelectionRule.new('pull_package', time_framed: false)
+#
+#   The above rule represents a defines a metric that "counts the total number of pull_package events"
+#
+module Gitlab
+  module Usage
+    class EventSelectionRule
+      include Gitlab::Usage::TimeSeriesStorable
+      include Gitlab::Usage::TimeFrame
+
+      COUNTER_KEY_PREFIX = "{event_counters}_"
+
+      attr_reader :filter, :name
+
+      def initialize(name:, time_framed:, filter: {})
+        @name = name
+        @time_framed = time_framed
+        @filter = filter || {}
+      end
+
+      def redis_key_for_date(date = Date.today)
+        redis_key(nil, date)
+      end
+
+      def redis_keys_for_time_frame(time_frame)
+        if time_frame == 'all'
+          [redis_key]
+        else
+          keys_for_aggregation(events: [path_part_of_redis_key], **time_constraint(time_frame))
+        end
+      end
+
+      def time_framed?
+        @time_framed
+      end
+
+      # Implementing `==` to make sure that `a == b` is true if and only if `a` and `b` have equal properties
+      # Checks equality by comparing each attribute.
+      # @param [Object] Object to be compared
+      def ==(other)
+        @name == other.name &&
+          time_framed? == other.time_framed? &&
+          @filter == other.filter
+      end
+
+      alias_method :eql?, :==
+
+      # Calculates hash code according to all attributes.
+      # @return [Integer] Hash code
+      # Ensures 2 objects with the same attributes can't be keys
+      # in the same hash twice
+      def hash
+        [name, time_framed?, filter].hash
+      end
+
+      private
+
+      def redis_key(_event_name = nil, date = Date.today, _used_in_aggregate_metric = false)
+        base_key = COUNTER_KEY_PREFIX + path_part_of_redis_key
+        return base_key unless time_framed?
+
+        apply_time_aggregation(base_key, date)
+      end
+
+      def time_constraint(time_frame)
+        case time_frame
+        when '28d'
+          monthly_time_range
+        when '7d'
+          weekly_time_range
+        else
+          raise "Unknown time frame: #{time_frame}"
+        end
+      end
+
+      def path_part_of_redis_key
+        path = name
+
+        if filter.present?
+          sorted_filter_keys = filter.keys.sort
+          serialized_filter = sorted_filter_keys.map { |key| "#{key}:#{filter[key]}" }.join(',')
+          path = "#{path}-filter:[#{serialized_filter}]"
+        end
+
+        path
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/usage/metric_definition.rb b/lib/gitlab/usage/metric_definition.rb
index cb3af222b14..98a2fdfc260 100644
--- a/lib/gitlab/usage/metric_definition.rb
+++ b/lib/gitlab/usage/metric_definition.rb
@@ -28,12 +28,12 @@ module Gitlab
       def event_selection_rules
         return [] unless @attributes[:events]
 
-        @attributes[:events].map do |event|
-          {
+        @event_selection_rules ||= @attributes[:events].map do |event|
+          EventSelectionRule.new(
             name: event[:name],
-            time_framed?: time_framed?,
-            filter: event[:filter] || {}
-          }
+            time_framed: time_framed?,
+            filter: event[:filter]
+          )
         end
       end
 
diff --git a/lib/gitlab/usage/metrics/instrumentations/base_metric.rb b/lib/gitlab/usage/metrics/instrumentations/base_metric.rb
index 31948e30992..409a0a152f0 100644
--- a/lib/gitlab/usage/metrics/instrumentations/base_metric.rb
+++ b/lib/gitlab/usage/metrics/instrumentations/base_metric.rb
@@ -8,6 +8,7 @@ module Gitlab
           include Gitlab::Utils::UsageData
           include Gitlab::Usage::TimeFrame
 
+          attr_reader :metric_definition
           attr_reader :time_frame
           attr_reader :options
           attr_reader :events
@@ -24,10 +25,11 @@ module Gitlab
             attr_reader :metric_available
           end
 
-          def initialize(metric_definition)
-            @time_frame = metric_definition.fetch(:time_frame)
-            @options = metric_definition.fetch(:options, {})
-            @events = metric_definition.fetch(:events, {})
+          def initialize(attributes)
+            @metric_definition = MetricDefinition.new(nil, attributes)
+            @time_frame = attributes.fetch(:time_frame)
+            @options = attributes.fetch(:options, {})
+            @events = attributes.fetch(:events, {})
           end
 
           def instrumentation
diff --git a/lib/gitlab/usage/metrics/instrumentations/total_count_metric.rb b/lib/gitlab/usage/metrics/instrumentations/total_count_metric.rb
index 3007de01d87..3dda254f7f6 100644
--- a/lib/gitlab/usage/metrics/instrumentations/total_count_metric.rb
+++ b/lib/gitlab/usage/metrics/instrumentations/total_count_metric.rb
@@ -14,29 +14,9 @@ module Gitlab
         #
         class TotalCountMetric < BaseMetric
           include Gitlab::UsageDataCounters::RedisCounter
-          extend Gitlab::Usage::TimeSeriesStorable
-
-          KEY_PREFIX = "{event_counters}_"
-
-          def self.redis_key(event_name, date = nil, _used_in_aggregate_metric = false)
-            base_key = KEY_PREFIX + event_name
-            return base_key unless date
-
-            apply_time_aggregation(base_key, date)
-          end
 
           def value
-            event_specific_part_of_paths = events.map do |event_selection_rule|
-              Gitlab::InternalEvents.convert_event_selection_rule_to_path_part(event_selection_rule)
-            end
-
-            keys = if time_frame == 'all'
-                     event_specific_part_of_paths.map do |event_specific_part_of_path|
-                       self.class.redis_key(event_specific_part_of_path)
-                     end
-                   else
-                     self.class.keys_for_aggregation(events: event_specific_part_of_paths, **time_constraint)
-                   end
+            keys = metric_definition.event_selection_rules.flat_map { |e| e.redis_keys_for_time_frame(time_frame) }
 
             keys.sum do |key|
               redis_usage_data do
@@ -44,21 +24,6 @@ module Gitlab
               end
             end
           end
-
-          def time_constraint
-            case time_frame
-            when '28d'
-              monthly_time_range
-            when '7d'
-              weekly_time_range
-            else
-              raise "Unknown time frame: #{time_frame} for #{self.class} :: #{events}"
-            end
-          end
-
-          def event_names
-            events.pluck(:name)
-          end
         end
       end
     end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index ef404135558..97c2d0ba24d 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8018,9 +8018,6 @@ msgstr ""
 msgid "Below you will find all the groups that are public or internal. Contribute by requesting to join a group."
 msgstr ""
 
-msgid "Below you will find all the groups that are public. Contribute by requesting to join a group."
-msgstr ""
-
 msgid "Beta"
 msgstr ""
 
@@ -25501,9 +25498,6 @@ msgstr ""
 msgid "GroupsEmptyState|No inactive projects."
 msgstr ""
 
-msgid "GroupsEmptyState|No public groups"
-msgstr ""
-
 msgid "GroupsEmptyState|No public or internal groups"
 msgstr ""
 
@@ -54780,10 +54774,10 @@ msgstr ""
 msgid "Todos|added a to-do item"
 msgstr ""
 
-msgid "Todos|has requested access to %{what} %{which}"
+msgid "Todos|has added you as an approver"
 msgstr ""
 
-msgid "Todos|have been added as an approver"
+msgid "Todos|has requested access to %{what} %{which}"
 msgstr ""
 
 msgid "Todos|mentioned %{who}"
diff --git a/rubocop/cop/migration/background_migration_base_class.rb b/rubocop/cop/migration/batched_migration_base_class.rb
similarity index 95%
rename from rubocop/cop/migration/background_migration_base_class.rb
rename to rubocop/cop/migration/batched_migration_base_class.rb
index 1a3a40cb66b..dadb1bd1e4c 100644
--- a/rubocop/cop/migration/background_migration_base_class.rb
+++ b/rubocop/cop/migration/batched_migration_base_class.rb
@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Migration
-      class BackgroundMigrationBaseClass < RuboCop::Cop::Base
+      class BatchedMigrationBaseClass < RuboCop::Cop::Base
         MSG = 'Batched background migration jobs should inherit from either ' \
           'Gitlab::BackgroundMigration::BatchedMigrationJob ' \
           'or one of its subclasses.'
diff --git a/scripts/setup/generate-as-if-foss-env.rb b/scripts/setup/generate-as-if-foss-env.rb
index d00ecadf189..556ee5503bc 100755
--- a/scripts/setup/generate-as-if-foss-env.rb
+++ b/scripts/setup/generate-as-if-foss-env.rb
@@ -6,7 +6,7 @@ require 'gitlab' unless Object.const_defined?(:Gitlab)
 require 'set' # rubocop:disable Lint/RedundantRequireStatement -- Ruby 3.1 and earlier needs this. Drop this line after Ruby 3.2+ is only supported.
 
 class GenerateAsIfFossEnv
-  PARALLEL = %r{(?: \d+/\d+)?}
+  PARALLEL = %r{(?: \d+/\d+)}
   PG_JOB = %r{\S+ pg\d+}
 
   # Map job names to environment variables. One job can match multiple variables.
@@ -32,7 +32,7 @@ class GenerateAsIfFossEnv
     /^cache-assets\b/ => 'ENABLE_CACHE_ASSETS',
     # Jest
     /^jest#{PARALLEL}/ => 'ENABLE_JEST',
-    /^jest-integration#{PARALLEL}/ => 'ENABLE_JEST_INTEGRATION',
+    /^jest-integration/ => 'ENABLE_JEST_INTEGRATION',
     /^jest predictive#{PARALLEL}/ => 'ENABLE_JEST_PREDICTIVE',
     # RSpec
     /^rspec/ => 'ENABLE_RSPEC',
diff --git a/spec/controllers/concerns/group_tree_spec.rb b/spec/controllers/concerns/group_tree_spec.rb
index 921706b2042..95d5b275391 100644
--- a/spec/controllers/concerns/group_tree_spec.rb
+++ b/spec/controllers/concerns/group_tree_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe GroupTree do
+RSpec.describe GroupTree, feature_category: :groups_and_projects do
   let(:group) { create(:group, :public) }
   let(:user) { create(:user) }
 
diff --git a/spec/controllers/concerns/product_analytics_tracking_spec.rb b/spec/controllers/concerns/product_analytics_tracking_spec.rb
index 58386bd0b3b..ae7d16b88e0 100644
--- a/spec/controllers/concerns/product_analytics_tracking_spec.rb
+++ b/spec/controllers/concerns/product_analytics_tracking_spec.rb
@@ -57,14 +57,14 @@ RSpec.describe ProductAnalyticsTracking, :snowplow, feature_category: :product_a
       expect(Gitlab::InternalEvents).not_to receive(:track_event)
     end
 
+    let(:all_time_total_count) { Gitlab::Usage::EventSelectionRule.new(name: event_name, time_framed: false) }
+    let(:time_framed_total_count) { Gitlab::Usage::EventSelectionRule.new(name: event_name, time_framed: true) }
+
     before do
       allow(Gitlab::Tracking::EventDefinition).to receive(:internal_event_exists?).with('an_event').and_return(true)
       event_definition = instance_double(
         Gitlab::Tracking::EventDefinition,
-        event_selection_rules: [
-          { name: event_name, time_framed?: false, filter: {} },
-          { name: event_name, time_framed?: true, filter: {} }
-        ]
+        event_selection_rules: [all_time_total_count, time_framed_total_count]
       )
       allow(Gitlab::Tracking::EventDefinition).to receive(:find).with(event_name).and_return(event_definition)
     end
@@ -117,8 +117,8 @@ RSpec.describe ProductAnalyticsTracking, :snowplow, feature_category: :product_a
       end
 
       it 'tracks total Redis counters' do
-        expect(Gitlab::Usage::Metrics::Instrumentations::TotalCountMetric).to receive(:redis_key)
-          .twice.and_call_original # total and 7d
+        expect(all_time_total_count).to receive(:redis_key_for_date).and_call_original
+        expect(time_framed_total_count).to receive(:redis_key_for_date).and_call_original
 
         get :index
       end
diff --git a/spec/controllers/explore/groups_controller_spec.rb b/spec/controllers/explore/groups_controller_spec.rb
index 76bd94fd681..867e2111774 100644
--- a/spec/controllers/explore/groups_controller_spec.rb
+++ b/spec/controllers/explore/groups_controller_spec.rb
@@ -2,8 +2,8 @@
 
 require 'spec_helper'
 
-RSpec.describe Explore::GroupsController do
-  let(:user) { create(:user) }
+RSpec.describe Explore::GroupsController, feature_category: :groups_and_projects do
+  let_it_be(:user) { create(:user) }
 
   before do
     sign_in(user)
diff --git a/spec/controllers/groups/dependency_proxy_for_containers_controller_spec.rb b/spec/controllers/groups/dependency_proxy_for_containers_controller_spec.rb
index 016214c20f0..9ea6e8820f7 100644
--- a/spec/controllers/groups/dependency_proxy_for_containers_controller_spec.rb
+++ b/spec/controllers/groups/dependency_proxy_for_containers_controller_spec.rb
@@ -181,7 +181,9 @@ RSpec.describe Groups::DependencyProxyForContainersController, feature_category:
       group.add_guest(user)
     end
 
-    context 'with a valid user' do
+    # When authenticating with a job token, the encoded token is the same as
+    # that built when authenticating with a user
+    context 'with a valid user or a job token' do
       it_behaves_like 'sends Workhorse instructions'
     end
 
@@ -297,7 +299,9 @@ RSpec.describe Groups::DependencyProxyForContainersController, feature_category:
         end
       end
 
-      context 'a valid user' do
+      # When authenticating with a job token, the encoded token is the same as
+      # that built when authenticating with a user
+      context 'a valid user or a job token' do
         before do
           group.add_guest(user)
         end
diff --git a/spec/features/explore/groups_list_spec.rb b/spec/features/explore/groups_list_spec.rb
index c89eb24c919..b9aaf4d68e3 100644
--- a/spec/features/explore/groups_list_spec.rb
+++ b/spec/features/explore/groups_list_spec.rb
@@ -3,18 +3,13 @@
 require 'spec_helper'
 
 RSpec.describe 'Explore Groups page', :js, feature_category: :groups_and_projects do
-  let!(:user) { create :user }
-  let(:com?) { false }
-
-  before do
-    allow(Gitlab).to receive(:com?).and_return(com?)
-  end
+  let_it_be(:user) { create(:user) }
 
   context 'when there are groups to show' do
-    let!(:group) { create(:group) }
-    let!(:public_group) { create(:group, :public) }
-    let!(:private_group) { create(:group, :private) }
-    let!(:empty_project) { create(:project, group: public_group) }
+    let_it_be(:group) { create(:group, created_at: 5.days.ago) }
+    let_it_be(:public_group) { create(:group, :public, created_at: 4.days.ago) }
+    let_it_be(:private_group) { create(:group, :private, created_at: 3.days.ago) }
+    let_it_be(:empty_project) { create(:project, group: public_group) }
 
     before do
       group.add_owner(user)
@@ -83,21 +78,43 @@ RSpec.describe 'Explore Groups page', :js, feature_category: :groups_and_project
       ).to have_text("1")
     end
 
-    context 'when on gitlab.com' do
-      let(:com?) { true }
-
-      it 'renders page description' do
-        expect(page).to have_content(
-          'Below you will find all the groups that are public. Contribute by requesting to join a group.'
-        )
-      end
+    it 'renders page description' do
+      expect(page).to have_content(
+        'Below you will find all the groups that are public or internal. Contribute by requesting to join a group.'
+      )
     end
 
-    context 'when on self-managed' do
-      it 'renders page description' do
-        expect(page).to have_content(
-          'Below you will find all the groups that are public or internal. Contribute by requesting to join a group.'
-        )
+    context 'when using pagination' do
+      before do
+        group.add_owner(user)
+        public_group.add_owner(user)
+
+        allow(Kaminari.config).to receive(:default_per_page).and_return(1)
+
+        sign_in(user)
+        visit explore_groups_path
+        wait_for_requests
+      end
+
+      it 'loads results for next page' do
+        expect(page).to have_selector('.gl-pagination .page-item a.page-link', count: 3)
+
+        # Check first page
+        expect(page).to have_content(public_group.full_name)
+        expect(page).to have_selector("#group-#{public_group.id}")
+        expect(page).not_to have_content(group.full_name)
+        expect(page).not_to have_selector("#group-#{group.id}")
+
+        # Go to next page
+        find('.gl-pagination .page-item:last-of-type a.page-link').click
+
+        wait_for_requests
+
+        # Check second page
+        expect(page).to have_content(group.full_name)
+        expect(page).to have_selector("#group-#{group.id}")
+        expect(page).not_to have_content(public_group.full_name)
+        expect(page).not_to have_selector("#group-#{public_group.id}")
       end
     end
   end
@@ -110,18 +127,8 @@ RSpec.describe 'Explore Groups page', :js, feature_category: :groups_and_project
       wait_for_requests
     end
 
-    context 'when on gitlab.com' do
-      let(:com?) { true }
-
-      it 'shows empty state' do
-        expect(page).to have_content(_('No public groups'))
-      end
-    end
-
-    context 'when on self-managed' do
-      it 'shows empty state' do
-        expect(page).to have_content(_('No public or internal groups'))
-      end
+    it 'shows empty state' do
+      expect(page).to have_content(_('No public or internal groups'))
     end
   end
 
diff --git a/spec/features/groups/dependency_proxy_for_containers_spec.rb b/spec/features/groups/dependency_proxy_for_containers_spec.rb
index 3810976eeda..93746ea8d54 100644
--- a/spec/features/groups/dependency_proxy_for_containers_spec.rb
+++ b/spec/features/groups/dependency_proxy_for_containers_spec.rb
@@ -66,11 +66,68 @@ RSpec.describe 'Group Dependency Proxy for containers', :js, feature_category: :
     end
   end
 
+  shared_examples 'returns not found' do
+    it 'returns not found' do
+      expect(subject.code).to eq(404)
+    end
+  end
+
   context 'fetching a blob' do
     context 'when the blob is cached for the group' do
       let!(:dependency_proxy_blob) { create(:dependency_proxy_blob, group: group) }
 
-      it_behaves_like 'responds with the file'
+      # When authenticating with a job token, the encoded token is the same as
+      # that built when authenticating with a user
+      context 'with a user or a job token' do
+        let_it_be(:headers) { { 'Authorization' => "Bearer #{build_jwt(user).encoded}" } }
+
+        it_behaves_like 'responds with the file'
+      end
+
+      context 'with a personal access token' do
+        let_it_be(:personal_access_token) { create(:personal_access_token, user: user) }
+        let_it_be(:headers) { { 'Authorization' => "Bearer #{build_jwt(personal_access_token).encoded}" } }
+
+        it_behaves_like 'responds with the file'
+      end
+
+      context 'with a group access token' do
+        context 'when a member of the group' do
+          let_it_be(:group_bot_user) { create(:user, :project_bot, guest_of: group) }
+          let_it_be(:group_access_token) { create(:personal_access_token, user: group_bot_user) }
+          let_it_be(:headers) { { 'Authorization' => "Bearer #{build_jwt(group_access_token).encoded}" } }
+
+          it_behaves_like 'responds with the file'
+        end
+
+        context 'when not a member of the group' do
+          let_it_be(:group_bot_user) { create(:user, :project_bot) }
+          let_it_be(:group_access_token) { create(:personal_access_token, user: group_bot_user) }
+          let_it_be(:headers) { { 'Authorization' => "Bearer #{build_jwt(group_access_token).encoded}" } }
+
+          it_behaves_like 'returns not found'
+        end
+      end
+
+      context 'with a group deploy token' do
+        before do
+          create(:group_deploy_token, group: group, deploy_token: deploy_token)
+        end
+
+        context 'with sufficient scopes' do
+          let_it_be(:deploy_token) { create(:deploy_token, :group, :dependency_proxy_scopes) }
+          let_it_be(:headers) { { 'Authorization' => "Bearer #{build_jwt(deploy_token).encoded}" } }
+
+          it_behaves_like 'responds with the file'
+        end
+
+        context 'with insufficient scopes' do
+          let_it_be(:deploy_token) { create(:deploy_token, :group) }
+          let_it_be(:headers) { { 'Authorization' => "Bearer #{build_jwt(deploy_token).encoded}" } }
+
+          it_behaves_like 'returns not found'
+        end
+      end
     end
   end
 
diff --git a/spec/frontend/groups/components/empty_states/groups_explore_empty_state_spec.js b/spec/frontend/groups/components/empty_states/groups_explore_empty_state_spec.js
index 34b547c807c..e2e8606232d 100644
--- a/spec/frontend/groups/components/empty_states/groups_explore_empty_state_spec.js
+++ b/spec/frontend/groups/components/empty_states/groups_explore_empty_state_spec.js
@@ -20,31 +20,12 @@ afterEach(() => {
 });
 
 describe('GroupsExploreEmptyState', () => {
-  describe('when on gitlab.com', () => {
-    beforeEach(() => {
-      window.gon = {
-        dot_com: true,
-      };
-    });
+  it('renders empty state', () => {
+    createComponent();
 
-    it('renders empty state', () => {
-      createComponent();
-
-      expect(wrapper.findComponent(GlEmptyState).props()).toMatchObject({
-        title: 'No public groups',
-        svgPath: defaultProvide.groupsEmptyStateIllustration,
-      });
-    });
-  });
-
-  describe('when on self-managed', () => {
-    it('renders empty state', () => {
-      createComponent();
-
-      expect(wrapper.findComponent(GlEmptyState).props()).toMatchObject({
-        title: 'No public or internal groups',
-        svgPath: defaultProvide.groupsEmptyStateIllustration,
-      });
+    expect(wrapper.findComponent(GlEmptyState).props()).toMatchObject({
+      title: 'No public or internal groups',
+      svgPath: defaultProvide.groupsEmptyStateIllustration,
     });
   });
 });
diff --git a/spec/frontend/ide/init_gitlab_web_ide_spec.js b/spec/frontend/ide/init_gitlab_web_ide_spec.js
index 69bd7c2a3a8..007f1ca740d 100644
--- a/spec/frontend/ide/init_gitlab_web_ide_spec.js
+++ b/spec/frontend/ide/init_gitlab_web_ide_spec.js
@@ -170,7 +170,7 @@ describe('ide/init_gitlab_web_ide', () => {
 
       // why: Snapshot to test that the element was cleaned including `test-class`
       expect(rootEl.outerHTML).toBe(
-        '<div id="ide" class="gl--flex-center gl-relative gl-h-full"></div>',
+        '<div id="ide" class="gl-flex gl-justify-center gl-items-center gl-relative gl-h-full"></div>',
       );
     });
 
diff --git a/spec/frontend/ide/lib/gitlab_web_ide/setup_root_element_spec.js b/spec/frontend/ide/lib/gitlab_web_ide/setup_root_element_spec.js
index 011f2564cec..b735d2b5249 100644
--- a/spec/frontend/ide/lib/gitlab_web_ide/setup_root_element_spec.js
+++ b/spec/frontend/ide/lib/gitlab_web_ide/setup_root_element_spec.js
@@ -24,7 +24,7 @@ describe('~/ide/lib/gitlab_web_ide/setup_root_element', () => {
     expect(result).toBe(findIDERoot());
     expect(result).toMatchInlineSnapshot(`
       <div
-        class="gl--flex-center gl-h-full gl-relative"
+        class="gl-flex gl-h-full gl-items-center gl-justify-center gl-relative"
         id="reference-0"
       />
     `);
diff --git a/spec/frontend/vue_shared/components/registry/__snapshots__/history_item_spec.js.snap b/spec/frontend/vue_shared/components/registry/__snapshots__/history_item_spec.js.snap
index e163e01e6e7..bf42dc9a781 100644
--- a/spec/frontend/vue_shared/components/registry/__snapshots__/history_item_spec.js.snap
+++ b/spec/frontend/vue_shared/components/registry/__snapshots__/history_item_spec.js.snap
@@ -8,7 +8,7 @@ exports[`History Item renders the correct markup 1`] = `
     class="timeline-entry-inner"
   >
     <div
-      class="-gl-mt-1 gl--flex-center gl-bg-gray-50 gl-float-left gl-h-6 gl-ml-2 gl-rounded-full gl-text-gray-600 gl-w-6"
+      class="-gl-mt-1 gl-bg-gray-50 gl-flex gl-float-left gl-h-6 gl-items-center gl-justify-center gl-ml-2 gl-rounded-full gl-text-gray-600 gl-w-6"
     >
       <gl-icon-stub
         name="pencil"
diff --git a/spec/lib/gitlab/ci/ansi2html_spec.rb b/spec/lib/gitlab/ci/ansi2html_spec.rb
index 27b39fe40aa..40c49b29157 100644
--- a/spec/lib/gitlab/ci/ansi2html_spec.rb
+++ b/spec/lib/gitlab/ci/ansi2html_spec.rb
@@ -1,302 +1,334 @@
 # frozen_string_literal: true
 
+# TODO Replace with require 'fast_spec_helper'; require 'oj' once parse_ci_job_timestamps FF is removed
 require 'spec_helper'
 
-RSpec.describe Gitlab::Ci::Ansi2html do
+RSpec.describe Gitlab::Ci::Ansi2html, feature_category: :continuous_integration do
   subject { described_class }
 
-  it "prints non-ansi as-is" do
-    expect(convert_html("Hello")).to eq('<span>Hello</span>')
-  end
+  shared_examples 'a working Ansi2html service' do |line_prefix: nil|
+    it "prints non-ansi as-is" do
+      expect(convert_html("#{line_prefix}Hello")).to eq('<span>Hello</span>')
+    end
 
-  it "strips non-color-changing control sequences" do
-    expect(convert_html("Hello \e[2Kworld")).to eq('<span>Hello world</span>')
-  end
+    context 'with ansi escape sequences' do
+      it "strips non-color-changing control sequences" do
+        expect(convert_html("#{line_prefix}Hello \e[2Kworld")).to eq('<span>Hello world</span>')
+      end
 
-  it "prints simply red" do
-    expect(convert_html("\e[31mHello\e[0m")).to eq('<span class="term-fg-red">Hello</span>')
-  end
+      it "prints simply red" do
+        expect(convert_html("#{line_prefix}\e[31mHello\e[0m")).to eq('<span class="term-fg-red">Hello</span>')
+      end
 
-  it "prints simply red without trailing reset" do
-    expect(convert_html("\e[31mHello")).to eq('<span class="term-fg-red">Hello</span>')
-  end
+      it "prints simply red without trailing reset" do
+        expect(convert_html("#{line_prefix}\e[31mHello")).to eq('<span class="term-fg-red">Hello</span>')
+      end
 
-  it "prints simply yellow" do
-    expect(convert_html("\e[33mHello\e[0m")).to eq('<span class="term-fg-yellow">Hello</span>')
-  end
+      it "prints simply yellow" do
+        expect(convert_html("#{line_prefix}\e[33mHello\e[0m")).to eq('<span class="term-fg-yellow">Hello</span>')
+      end
 
-  it "prints default on blue" do
-    expect(convert_html("\e[39;44mHello")).to eq('<span class="term-bg-blue">Hello</span>')
-  end
+      it "prints default on blue" do
+        expect(convert_html("#{line_prefix}\e[39;44mHello")).to eq('<span class="term-bg-blue">Hello</span>')
+      end
 
-  it "prints red on blue" do
-    expect(convert_html("\e[31;44mHello")).to eq('<span class="term-fg-red term-bg-blue">Hello</span>')
-  end
+      it "prints red on blue" do
+        expect(convert_html("#{line_prefix}\e[31;44mHello")).to eq('<span class="term-fg-red term-bg-blue">Hello</span>')
+      end
 
-  it "resets colors after red on blue" do
-    expect(convert_html("\e[31;44mHello\e[0m world")).to eq('<span class="term-fg-red term-bg-blue">Hello</span><span> world</span>')
-  end
+      it "resets colors after red on blue" do
+        expect(convert_html("#{line_prefix}\e[31;44mHello\e[0m world")).to eq('<span class="term-fg-red term-bg-blue">Hello</span><span> world</span>')
+      end
 
-  it "performs color change from red/blue to yellow/blue" do
-    expect(convert_html("\e[31;44mHello \e[33mworld")).to eq('<span class="term-fg-red term-bg-blue">Hello </span><span class="term-fg-yellow term-bg-blue">world</span>')
-  end
+      it "performs color change from red/blue to yellow/blue" do
+        expect(convert_html("#{line_prefix}\e[31;44mHello \e[33mworld")).to eq('<span class="term-fg-red term-bg-blue">Hello </span><span class="term-fg-yellow term-bg-blue">world</span>')
+      end
 
-  it "performs color change from red/blue to yellow/green" do
-    expect(convert_html("\e[31;44mHello \e[33;42mworld")).to eq('<span class="term-fg-red term-bg-blue">Hello </span><span class="term-fg-yellow term-bg-green">world</span>')
-  end
+      it "performs color change from red/blue to yellow/green" do
+        expect(convert_html("#{line_prefix}\e[31;44mHello \e[33;42mworld")).to eq('<span class="term-fg-red term-bg-blue">Hello </span><span class="term-fg-yellow term-bg-green">world</span>')
+      end
 
-  it "performs color change from red/blue to reset to yellow/green" do
-    expect(convert_html("\e[31;44mHello\e[0m \e[33;42mworld")).to eq('<span class="term-fg-red term-bg-blue">Hello</span><span> </span><span class="term-fg-yellow term-bg-green">world</span>')
-  end
+      it "performs color change from red/blue to reset to yellow/green" do
+        expect(convert_html("#{line_prefix}\e[31;44mHello\e[0m \e[33;42mworld")).to eq('<span class="term-fg-red term-bg-blue">Hello</span><span> </span><span class="term-fg-yellow term-bg-green">world</span>')
+      end
 
-  it "ignores unsupported codes" do
-    expect(convert_html("\e[51mHello\e[0m")).to eq('<span>Hello</span>')
-  end
+      it "ignores unsupported codes" do
+        expect(convert_html("#{line_prefix}\e[51mHello\e[0m")).to eq('<span>Hello</span>')
+      end
 
-  it "prints light red" do
-    expect(convert_html("\e[91mHello\e[0m")).to eq('<span class="term-fg-l-red">Hello</span>')
-  end
+      it "prints light red" do
+        expect(convert_html("#{line_prefix}\e[91mHello\e[0m")).to eq('<span class="term-fg-l-red">Hello</span>')
+      end
 
-  it "prints default on light red" do
-    expect(convert_html("\e[101mHello\e[0m")).to eq('<span class="term-bg-l-red">Hello</span>')
-  end
+      it "prints default on light red" do
+        expect(convert_html("#{line_prefix}\e[101mHello\e[0m")).to eq('<span class="term-bg-l-red">Hello</span>')
+      end
 
-  it "performs color change from red/blue to default/blue" do
-    expect(convert_html("\e[31;44mHello \e[39mworld")).to eq('<span class="term-fg-red term-bg-blue">Hello </span><span class="term-bg-blue">world</span>')
-  end
+      it "performs color change from red/blue to default/blue" do
+        expect(convert_html("#{line_prefix}\e[31;44mHello \e[39mworld")).to eq('<span class="term-fg-red term-bg-blue">Hello </span><span class="term-bg-blue">world</span>')
+      end
 
-  it "performs color change from light red/blue to default/blue" do
-    expect(convert_html("\e[91;44mHello \e[39mworld")).to eq('<span class="term-fg-l-red term-bg-blue">Hello </span><span class="term-bg-blue">world</span>')
-  end
+      it "performs color change from light red/blue to default/blue" do
+        expect(convert_html("#{line_prefix}\e[91;44mHello \e[39mworld")).to eq('<span class="term-fg-l-red term-bg-blue">Hello </span><span class="term-bg-blue">world</span>')
+      end
 
-  it "prints bold text" do
-    expect(convert_html("\e[1mHello")).to eq('<span class="term-bold">Hello</span>')
-  end
+      it "prints bold text" do
+        expect(convert_html("#{line_prefix}\e[1mHello")).to eq('<span class="term-bold">Hello</span>')
+      end
 
-  it "resets bold text" do
-    expect(convert_html("\e[1mHello\e[21m world")).to eq('<span class="term-bold">Hello</span><span> world</span>')
-    expect(convert_html("\e[1mHello\e[22m world")).to eq('<span class="term-bold">Hello</span><span> world</span>')
-  end
+      it "resets bold text" do
+        expect(convert_html("#{line_prefix}\e[1mHello\e[21m world")).to eq('<span class="term-bold">Hello</span><span> world</span>')
+        expect(convert_html("#{line_prefix}\e[1mHello\e[22m world")).to eq('<span class="term-bold">Hello</span><span> world</span>')
+      end
 
-  it "prints italic text" do
-    expect(convert_html("\e[3mHello")).to eq('<span class="term-italic">Hello</span>')
-  end
+      it "prints italic text" do
+        expect(convert_html("#{line_prefix}\e[3mHello")).to eq('<span class="term-italic">Hello</span>')
+      end
 
-  it "resets italic text" do
-    expect(convert_html("\e[3mHello\e[23m world")).to eq('<span class="term-italic">Hello</span><span> world</span>')
-  end
+      it "resets italic text" do
+        expect(convert_html("#{line_prefix}\e[3mHello\e[23m world")).to eq('<span class="term-italic">Hello</span><span> world</span>')
+      end
 
-  it "prints underlined text" do
-    expect(convert_html("\e[4mHello")).to eq('<span class="term-underline">Hello</span>')
-  end
+      it "prints underlined text" do
+        expect(convert_html("#{line_prefix}\e[4mHello")).to eq('<span class="term-underline">Hello</span>')
+      end
 
-  it "resets underlined text" do
-    expect(convert_html("\e[4mHello\e[24m world")).to eq('<span class="term-underline">Hello</span><span> world</span>')
-  end
+      it "resets underlined text" do
+        expect(convert_html("#{line_prefix}\e[4mHello\e[24m world")).to eq('<span class="term-underline">Hello</span><span> world</span>')
+      end
 
-  it "prints concealed text" do
-    expect(convert_html("\e[8mHello")).to eq('<span class="term-conceal">Hello</span>')
-  end
+      it "prints concealed text" do
+        expect(convert_html("#{line_prefix}\e[8mHello")).to eq('<span class="term-conceal">Hello</span>')
+      end
 
-  it "resets concealed text" do
-    expect(convert_html("\e[8mHello\e[28m world")).to eq('<span class="term-conceal">Hello</span><span> world</span>')
-  end
+      it "resets concealed text" do
+        expect(convert_html("#{line_prefix}\e[8mHello\e[28m world")).to eq('<span class="term-conceal">Hello</span><span> world</span>')
+      end
 
-  it "prints crossed-out text" do
-    expect(convert_html("\e[9mHello")).to eq('<span class="term-cross">Hello</span>')
-  end
+      it "prints crossed-out text" do
+        expect(convert_html("#{line_prefix}\e[9mHello")).to eq('<span class="term-cross">Hello</span>')
+      end
 
-  it "resets crossed-out text" do
-    expect(convert_html("\e[9mHello\e[29m world")).to eq('<span class="term-cross">Hello</span><span> world</span>')
-  end
+      it "resets crossed-out text" do
+        expect(convert_html("#{line_prefix}\e[9mHello\e[29m world")).to eq('<span class="term-cross">Hello</span><span> world</span>')
+      end
 
-  it "can print 256 xterm fg colors" do
-    expect(convert_html("\e[38;5;16mHello")).to eq('<span class="xterm-fg-16">Hello</span>')
-  end
+      it "can print 256 xterm fg colors" do
+        expect(convert_html("#{line_prefix}\e[38;5;16mHello")).to eq('<span class="xterm-fg-16">Hello</span>')
+      end
 
-  it "can print 256 xterm fg colors on normal magenta background" do
-    expect(convert_html("\e[38;5;16;45mHello")).to eq('<span class="xterm-fg-16 term-bg-magenta">Hello</span>')
-  end
+      it "can print 256 xterm fg colors on normal magenta background" do
+        expect(convert_html("#{line_prefix}\e[38;5;16;45mHello")).to eq('<span class="xterm-fg-16 term-bg-magenta">Hello</span>')
+      end
 
-  it "can print 256 xterm bg colors" do
-    expect(convert_html("\e[48;5;240mHello")).to eq('<span class="xterm-bg-240">Hello</span>')
-  end
+      it "can print 256 xterm bg colors" do
+        expect(convert_html("#{line_prefix}\e[48;5;240mHello")).to eq('<span class="xterm-bg-240">Hello</span>')
+      end
 
-  it "can print 256 xterm fg bold colors" do
-    expect(convert_html("\e[38;5;16;1mHello")).to eq('<span class="xterm-fg-16 term-bold">Hello</span>')
-  end
+      it "can print 256 xterm fg bold colors" do
+        expect(convert_html("#{line_prefix}\e[38;5;16;1mHello")).to eq('<span class="xterm-fg-16 term-bold">Hello</span>')
+      end
 
-  it "can print 256 xterm bg colors on normal magenta foreground" do
-    expect(convert_html("\e[48;5;16;35mHello")).to eq('<span class="term-fg-magenta xterm-bg-16">Hello</span>')
-  end
+      it "can print 256 xterm bg colors on normal magenta foreground" do
+        expect(convert_html("#{line_prefix}\e[48;5;16;35mHello")).to eq('<span class="term-fg-magenta xterm-bg-16">Hello</span>')
+      end
 
-  it "prints bold colored text vividly" do
-    expect(convert_html("\e[1;31mHello\e[0m")).to eq('<span class="term-fg-l-red term-bold">Hello</span>')
-  end
+      it "prints bold colored text vividly" do
+        expect(convert_html("#{line_prefix}\e[1;31mHello\e[0m")).to eq('<span class="term-fg-l-red term-bold">Hello</span>')
+      end
 
-  it "prints bold light colored text correctly" do
-    expect(convert_html("\e[1;91mHello\e[0m")).to eq('<span class="term-fg-l-red term-bold">Hello</span>')
-  end
-
-  it "prints &lt;" do
-    expect(convert_html("<")).to eq('<span>&lt;</span>')
-  end
-
-  it "replaces newlines with line break tags" do
-    expect(convert_html("\n")).to eq('<span><br/></span>')
-  end
-
-  it "groups carriage returns with newlines" do
-    expect(convert_html("\r\n")).to eq('<span><br/></span>')
-  end
-
-  it 'replaces invalid UTF-8 data' do
-    expect(convert_html("UTF-8 dashes here: ───\n🐤🐤🐤🐤\xF0\x9F\x90\n")).to eq("<span>UTF-8 dashes here: ───<br/>🐤🐤🐤🐤�<br/></span>")
-  end
-
-  describe "incremental update" do
-    shared_examples 'stateable converter' do
-      let(:pass1_stream) { StringIO.new(pre_text) }
-      let(:pass2_stream) { StringIO.new(pre_text + text) }
-      let(:pass1) { subject.convert(pass1_stream) }
-      let(:pass2) { subject.convert(pass2_stream, pass1.state) }
-
-      it "to returns html to append" do
-        expect(pass2.append).to be_truthy
-        expect(pass2.html).to eq(html)
-        expect(pass1.html + pass2.html).to eq(pre_html + html)
+      it "prints bold light colored text correctly" do
+        expect(convert_html("#{line_prefix}\e[1;91mHello\e[0m")).to eq('<span class="term-fg-l-red term-bold">Hello</span>')
       end
     end
 
-    context "with split word" do
-      let(:pre_text) { "\e[1mHello" }
-      let(:pre_html) { "<span class=\"term-bold\">Hello</span>" }
-      let(:text) { "\e[1mWorld" }
-      let(:html) { "<span class=\"term-bold\">World</span>" }
-
-      it_behaves_like 'stateable converter'
+    it "prints &lt;" do
+      expect(convert_html("#{line_prefix}<")).to eq('<span>&lt;</span>')
     end
 
-    context "with split sequence" do
-      let(:pre_text) { "\e[1m" }
-      let(:pre_html) { "" }
-      let(:text) { "Hello" }
-      let(:html) { "<span class=\"term-bold\">Hello</span>" }
-
-      it_behaves_like 'stateable converter'
+    it "replaces newlines with line break tags" do
+      expect(convert_html("#{line_prefix}\n#{line_prefix}")).to eq('<span><br/></span>')
     end
 
-    context "with partial sequence" do
-      let(:pre_text) { "Hello\e" }
-      let(:pre_html) { "<span>Hello</span>" }
-      let(:text) { "[1m World" }
-      let(:html) { "<span class=\"term-bold\"> World</span>" }
-
-      it_behaves_like 'stateable converter'
+    it "groups carriage returns with newlines" do
+      expect(convert_html("#{line_prefix}\r\n#{line_prefix}")).to eq('<span><br/></span>')
     end
 
-    context 'with new line' do
-      let(:pre_text) { "Hello\r" }
-      let(:pre_html) { "<span>Hello\r</span>" }
-      let(:text) { "\nWorld" }
-      let(:html) { "<span><br/>World</span>" }
-
-      it_behaves_like 'stateable converter'
-    end
-  end
-
-  context "with section markers" do
-    let(:section_name) { 'test_section' }
-    let(:section_start_time) { Time.new(2017, 9, 20).utc }
-    let(:section_duration) { 3.seconds }
-    let(:section_end_time) { section_start_time + section_duration }
-    let(:section_start) { "section_start:#{section_start_time.to_i}:#{section_name}\r\033[0K" }
-    let(:section_end) { "section_end:#{section_end_time.to_i}:#{section_name}\r\033[0K" }
-    let(:section_start_html) do
-      '<div class="section-start" ' \
-      "data-timestamp=\"#{section_start_time.to_i}\" data-section=\"#{class_name(section_name)}\" " \
-      'role="button"></div>'
+    it 'replaces invalid UTF-8 data' do
+      expect(convert_html("#{line_prefix}UTF-8 dashes here: ───\n🐤🐤🐤🐤\xF0\x9F\x90\n")).to eq("<span>UTF-8 dashes here: ───<br/>🐤🐤🐤🐤�<br/></span>")
     end
 
-    let(:section_end_html) do
-      "<div class=\"section-end\" data-section=\"#{class_name(section_name)}\"></div>"
-    end
+    describe "incremental update" do
+      shared_examples 'stateable converter' do
+        let(:pass1_stream) { StringIO.new(pre_text) }
+        let(:pass2_stream) { StringIO.new(pre_text + text) }
+        let(:pass1) { subject.convert(pass1_stream) }
+        let(:pass2) { subject.convert(pass2_stream, pass1.state) }
 
-    shared_examples 'forbidden char in section_name' do
-      it 'ignores sections' do
-        text = "#{section_start}Some text#{section_end}"
-        class_name_start = section_start.gsub("\033[0K", '').gsub('<', '&lt;')
-        class_name_end = section_end.gsub("\033[0K", '').gsub('<', '&lt;')
-        html = %(<span>#{class_name_start}Some text#{class_name_end}</span>)
+        it "to returns html to append" do
+          expect(pass2.append).to be_truthy
+          expect(pass2.html).to eq(html)
+          expect(pass1.html + pass2.html).to eq(pre_html + html)
+        end
+      end
 
-        expect(convert_html(text)).to eq(html)
+      context "with split word" do
+        let(:pre_text) { "\e[1mHello" }
+        let(:pre_html) { "<span class=\"term-bold\">Hello</span>" }
+        let(:text) { "\e[1mWorld" }
+        let(:html) { "<span class=\"term-bold\">World</span>" }
+
+        it_behaves_like 'stateable converter'
+      end
+
+      context "with split sequence" do
+        let(:pre_text) { "\e[1m" }
+        let(:pre_html) { "" }
+        let(:text) { "Hello" }
+        let(:html) { "<span class=\"term-bold\">Hello</span>" }
+
+        it_behaves_like 'stateable converter'
+      end
+
+      context "with partial sequence" do
+        let(:pre_text) { "Hello\e" }
+        let(:pre_html) { "<span>Hello</span>" }
+        let(:text) { "[1m World" }
+        let(:html) { "<span class=\"term-bold\"> World</span>" }
+
+        it_behaves_like 'stateable converter'
+      end
+
+      context 'with new line' do
+        let(:pre_text) { "Hello\r" }
+        let(:pre_html) { "<span>Hello\r</span>" }
+        let(:text) { "\nWorld" }
+        let(:html) { "<span><br/>World</span>" }
+
+        it_behaves_like 'stateable converter'
       end
     end
 
-    shared_examples 'a legit section' do
-      let(:text) { "#{section_start}Some text#{section_end}" }
-
-      it 'prints light red' do
-        text = "#{section_start}\e[91mHello\e[0m\nLine 1\nLine 2\nLine 3\n#{section_end}"
-        header = %(<span class="term-fg-l-red section section-header js-s-#{class_name(section_name)}">Hello</span>)
-        line_break = %(<span class="section section-header js-s-#{class_name(section_name)}"><br/></span>)
-        output_line = %(<span class="section line js-s-#{class_name(section_name)}">Line 1<br/>Line 2<br/>Line 3<br/></span>)
-        html = "#{section_start_html}#{header}#{line_break}#{output_line}#{section_end_html}"
-
-        expect(convert_html(text)).to eq(html)
+    context "with section markers" do
+      let(:section_name) { 'test_section' }
+      let(:section_start_time) { Time.new(2017, 9, 20).utc }
+      let(:section_duration) { 3.seconds }
+      let(:section_end_time) { section_start_time + section_duration }
+      let(:section_start) { "section_start:#{section_start_time.to_i}:#{section_name}\r\033[0K" }
+      let(:section_end) { "section_end:#{section_end_time.to_i}:#{section_name}\r\033[0K" }
+      let(:section_start_html) do
+        '<div class="section-start" ' \
+        "data-timestamp=\"#{section_start_time.to_i}\" data-section=\"#{class_name(section_name)}\" " \
+        'role="button"></div>'
       end
 
-      it 'begins with a section_start html marker' do
-        expect(convert_html(text)).to start_with(section_start_html)
+      let(:section_end_html) do
+        "<div class=\"section-end\" data-section=\"#{class_name(section_name)}\"></div>"
       end
 
-      it 'ends with a section_end html marker' do
-        expect(convert_html(text)).to end_with(section_end_html)
+      shared_examples 'forbidden char in section_name' do
+        it 'ignores sections' do
+          text = "#{line_prefix}#{section_start}Some text#{section_end}"
+          class_name_start = section_start.gsub("\033[0K", '').gsub('<', '&lt;')
+          class_name_end = section_end.gsub("\033[0K", '').gsub('<', '&lt;')
+          html = %(<span>#{class_name_start}Some text#{class_name_end}</span>)
+
+          expect(convert_html(text)).to eq(html)
+        end
       end
-    end
 
-    it_behaves_like 'a legit section'
+      shared_examples 'a legit section' do
+        let(:text) { "#{line_prefix}#{section_start}Some text#{section_end}" }
 
-    context 'section name includes $' do
-      let(:section_name) { 'my_$ection' }
+        it 'prints light red' do
+          text = "#{section_start}\e[91mHello\e[0m\nLine 1\nLine 2\nLine 3\n#{section_end}"
+          header = %(<span class="term-fg-l-red section section-header js-s-#{class_name(section_name)}">Hello</span>)
+          line_break = %(<span class="section section-header js-s-#{class_name(section_name)}"><br/></span>)
+          output_line = %(<span class="section line js-s-#{class_name(section_name)}">Line 1<br/>Line 2<br/>Line 3<br/></span>)
+          html = "#{section_start_html}#{header}#{line_break}#{output_line}#{section_end_html}"
 
-      it_behaves_like 'forbidden char in section_name'
-    end
+          expect(convert_html(text)).to eq(html)
+        end
 
-    context 'section name includes <' do
-      let(:section_name) { '<a_tag>' }
+        it 'begins with a section_start html marker' do
+          expect(convert_html(text)).to start_with(section_start_html)
+        end
 
-      it_behaves_like 'forbidden char in section_name'
-    end
-
-    context 'section name contains .-_' do
-      let(:section_name) { 'a.Legit-SeCtIoN_namE' }
+        it 'ends with a section_end html marker' do
+          expect(convert_html(text)).to end_with(section_end_html)
+        end
+      end
 
       it_behaves_like 'a legit section'
+
+      context 'section name includes $' do
+        let(:section_name) { 'my_$ection' }
+
+        it_behaves_like 'forbidden char in section_name'
+      end
+
+      context 'section name includes <' do
+        let(:section_name) { '<a_tag>' }
+
+        it_behaves_like 'forbidden char in section_name'
+      end
+
+      context 'section name contains .-_' do
+        let(:section_name) { 'a.Legit-SeCtIoN_namE' }
+
+        it_behaves_like 'a legit section'
+      end
+
+      it 'do not allow XSS injections' do
+        text = "#{line_prefix}#{section_start}section_end:1:2<script>alert('XSS Hack!');</script>#{section_end}"
+
+        expect(convert_html(text)).not_to include('<script>')
+      end
     end
 
-    it 'do not allow XSS injections' do
-      text = "#{section_start}section_end:1:2<script>alert('XSS Hack!');</script>#{section_end}"
+    describe "truncates" do
+      let(:text) { "#{line_prefix}Hello World" }
+      let(:stream) { StringIO.new(text) }
+      let(:subject) { described_class.convert(stream) }
 
-      expect(convert_html(text)).not_to include('<script>')
+      before do
+        stream.seek(3, IO::SEEK_SET)
+      end
+
+      it "returns truncated output" do
+        expect(subject.truncated).to be_truthy
+      end
+
+      it "does not append output" do
+        expect(subject.append).to be_falsey
+      end
     end
   end
 
-  describe "truncates" do
-    let(:text) { "Hello World" }
-    let(:stream) { StringIO.new(text) }
-    let(:subject) { described_class.convert(stream) }
+  it_behaves_like 'a working Ansi2html service'
+  it_behaves_like 'a working Ansi2html service', line_prefix: '2024-05-14T11:19:19.899359Z 00O '
 
+  context 'with parse_ci_job_timestamps FF disabled' do
     before do
-      stream.seek(3, IO::SEEK_SET)
+      stub_feature_flags(parse_ci_job_timestamps: false)
     end
 
-    it "returns truncated output" do
-      expect(subject.truncated).to be_truthy
-    end
+    it_behaves_like 'a working Ansi2html service'
+  end
 
-    it "does not append output" do
-      expect(subject.append).to be_falsey
+  context 'with timestamps' do
+    let(:timestamp) { '2024-05-14T11:19:19.899359Z 00O ' }
+
+    it "joins lines when following lines are marked as continuation" do
+      text = [
+        '2024-05-14T11:19:19.899359Z 00O Hello ',
+        '2024-05-14T11:19:20.000000Z 00O+world, ',
+        '2024-05-14T11:19:21.000000Z 00O+this is a second continuation',
+        '2024-05-14T11:19:22.000000Z 00O This is a second line'
+      ].join("\n")
+
+      expect(convert_html(text))
+        .to eq('<span>Hello world, this is a second continuation<br/>This is a second line</span>')
     end
   end
 
diff --git a/spec/lib/gitlab/internal_events_spec.rb b/spec/lib/gitlab/internal_events_spec.rb
index a550062b543..0b00b1368b0 100644
--- a/spec/lib/gitlab/internal_events_spec.rb
+++ b/spec/lib/gitlab/internal_events_spec.rb
@@ -101,8 +101,8 @@ RSpec.describe Gitlab::InternalEvents, :snowplow, feature_category: :product_ana
   let(:event_definition) { instance_double(Gitlab::Tracking::EventDefinition) }
   let(:event_selection_rules) do
     [
-      { name: event_name, time_framed?: false, filter: {} },
-      { name: event_name, time_framed?: true, filter: {} }
+      Gitlab::Usage::EventSelectionRule.new(name: event_name, time_framed: false),
+      Gitlab::Usage::EventSelectionRule.new(name: event_name, time_framed: true)
     ]
   end
 
@@ -188,10 +188,22 @@ RSpec.describe Gitlab::InternalEvents, :snowplow, feature_category: :product_ana
       let(:time_framed) { true }
       let(:event_selection_rules) do
         [
-          { name: event_name, time_framed?: time_framed, filter: {} },
-          { name: event_name, time_framed?: time_framed, filter: { label: 'label_name' } },
-          { name: event_name, time_framed?: time_framed, filter: { label: 'another_label_value' } },
-          { name: event_name, time_framed?: time_framed, filter: { label: 'label_name', value: 16.17 } }
+          Gitlab::Usage::EventSelectionRule.new(name: event_name, time_framed: time_framed),
+          Gitlab::Usage::EventSelectionRule.new(
+            name: event_name,
+            time_framed: time_framed,
+            filter: { label: 'label_name' }
+          ),
+          Gitlab::Usage::EventSelectionRule.new(
+            name: event_name,
+            time_framed: time_framed,
+            filter: { label: 'another_label_value' }
+          ),
+          Gitlab::Usage::EventSelectionRule.new(
+            name: event_name,
+            time_framed: time_framed,
+            filter: { label: 'label_name', value: 16.17 }
+          )
         ]
       end
 
@@ -216,6 +228,42 @@ RSpec.describe Gitlab::InternalEvents, :snowplow, feature_category: :product_ana
         end
       end
 
+      context 'when redis key is overridden in total_counter_redis_key_overrides.yml' do
+        let(:time_framed) { false }
+        let(:redis_arguments) { %w[SOME_LEGACY_KEY ANOTHER_LEGACY_KEY A_THIRD_LEGACY_KEY] }
+
+        let(:override_yaml) do
+          <<~YAML
+            '{event_counters}_#{event_name}-filter:[label:label_name]': #{redis_arguments[0]}
+            '{event_counters}_#{event_name}-filter:[label:label_name,value:16.17]': #{redis_arguments[1]}
+            '{event_counters}_#{event_name}': #{redis_arguments[2]}
+          YAML
+        end
+
+        before do
+          described_class.clear_memoization(:key_overrides)
+          allow(File).to receive(:read).and_call_original
+          allow(File).to receive(:read)
+            .with(Gitlab::UsageDataCounters::RedisCounter::KEY_OVERRIDES_PATH)
+            .and_return(override_yaml)
+        end
+
+        after do
+          described_class.clear_memoization(:key_overrides)
+        end
+
+        it 'updates the matching redis keys' do
+          described_class.track_event(
+            event_name,
+            additional_properties: additional_properties,
+            user: user,
+            project: project
+          )
+
+          expect_redis_tracking
+        end
+      end
+
       context 'when event selection rule is not time framed' do
         let(:time_framed) { false }
         let(:redis_arguments) do
@@ -459,34 +507,6 @@ RSpec.describe Gitlab::InternalEvents, :snowplow, feature_category: :product_ana
     end
   end
 
-  describe '#convert_event_selection_rule_to_path_part' do
-    context 'without a filter' do
-      let(:event_selection_rule) { { name: 'example_event' } }
-
-      it 'returns the event name' do
-        expect(described_class.convert_event_selection_rule_to_path_part(event_selection_rule)).to eq('example_event')
-      end
-    end
-
-    context 'with a single property filter' do
-      let(:event_selection_rule) { { name: 'example_event', filter: { label: 'npm' } } }
-
-      it 'returns the correct path with filter' do
-        expect(described_class.convert_event_selection_rule_to_path_part(event_selection_rule))
-          .to eq('example_event-filter:[label:npm]')
-      end
-    end
-
-    context 'with a multi property filter that are unordered' do
-      let(:event_selection_rule) { { name: 'example_event', filter: { property: 'deploy_token', label: 'npm' } } }
-
-      it 'returns the correct path with filter' do
-        expect(described_class.convert_event_selection_rule_to_path_part(event_selection_rule))
-          .to eq('example_event-filter:[label:npm,property:deploy_token]')
-      end
-    end
-  end
-
   describe 'Product Analytics tracking' do
     let(:app_id) { 'foobar' }
     let(:url) { 'http://localhost:4000' }
diff --git a/spec/lib/gitlab/usage/event_selection_rule_spec.rb b/spec/lib/gitlab/usage/event_selection_rule_spec.rb
new file mode 100644
index 00000000000..9d2221790f9
--- /dev/null
+++ b/spec/lib/gitlab/usage/event_selection_rule_spec.rb
@@ -0,0 +1,168 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Usage::EventSelectionRule, feature_category: :service_ping do
+  describe '#redis_key_for_date' do
+    let(:date) { Date.new(2023, 10, 19) }
+    let(:filter) { nil }
+    let(:event_selection_rule) do
+      described_class.new(
+        name: 'example_event',
+        time_framed: false,
+        filter: filter
+      )
+    end
+
+    context 'without a filter' do
+      it 'returns the key name' do
+        expect(event_selection_rule.redis_key_for_date).to eq('{event_counters}_example_event')
+      end
+    end
+
+    context 'with a single property filter' do
+      let(:filter) { { label: 'npm' } }
+
+      it 'returns the correct key with filter' do
+        expect(event_selection_rule.redis_key_for_date).to eq('{event_counters}_example_event-filter:[label:npm]')
+      end
+    end
+
+    context 'with a multi property filter that is unordered' do
+      let(:filter) { { property: 'deploy_token', label: 'npm' } }
+
+      it 'returns the correct key with filter' do
+        expect(event_selection_rule.redis_key_for_date)
+          .to eq('{event_counters}_example_event-filter:[label:npm,property:deploy_token]')
+      end
+    end
+
+    context "when time framed" do
+      let(:event_selection_rule) { described_class.new(name: 'my_event', time_framed: true) }
+
+      it 'adds the key prefix and suffix to the event name' do
+        expect(event_selection_rule.redis_key_for_date(date)).to eq("{event_counters}_my_event-2023-42")
+      end
+    end
+  end
+
+  describe '#redis_keys_for_time_frame' do
+    around do |example|
+      reference_time = Time.utc(2024, 6, 1)
+      travel_to(reference_time) { example.run }
+    end
+
+    context 'without a filter' do
+      let(:time_framed) { true }
+      let(:event_selection_rule) do
+        described_class.new(
+          name: 'an_event',
+          time_framed: time_framed,
+          filter: {}
+        )
+      end
+
+      context 'when time_frame is "all"' do
+        let(:time_framed) { false }
+
+        it 'returns an array with a single redis key' do
+          expect(event_selection_rule.redis_keys_for_time_frame('all')).to eq(['{event_counters}_an_event'])
+        end
+      end
+
+      context 'when time_frame is "7d"' do
+        it 'returns an array with a single redis keys for correct week' do
+          expect(event_selection_rule.redis_keys_for_time_frame('7d')).to eq(["{event_counters}_an_event-2024-21"])
+        end
+      end
+
+      context 'when time_frame is "28d"' do
+        it 'returns an array with a keys for the last 4 full weeks' do
+          expect(event_selection_rule.redis_keys_for_time_frame('28d')).to eq(
+            [
+              "{event_counters}_an_event-2024-18",
+              "{event_counters}_an_event-2024-19",
+              "{event_counters}_an_event-2024-20",
+              "{event_counters}_an_event-2024-21"
+            ]
+          )
+        end
+      end
+    end
+
+    context 'with a filter' do
+      let(:time_framed) { true }
+      let(:event_selection_rule) do
+        described_class.new(
+          name: 'an_event',
+          time_framed: time_framed,
+          filter: { label: 'foo' }
+        )
+      end
+
+      context 'when time_frame is "all"' do
+        let(:time_framed) { false }
+
+        it 'returns an array with a single redis key' do
+          expect(event_selection_rule.redis_keys_for_time_frame('all'))
+            .to eq(['{event_counters}_an_event-filter:[label:foo]'])
+        end
+      end
+
+      context 'when time_frame is "7d"' do
+        it 'returns an array with a single redis keys for correct week' do
+          expect(event_selection_rule.redis_keys_for_time_frame('7d'))
+            .to eq(["{event_counters}_an_event-filter:[label:foo]-2024-21"])
+        end
+      end
+
+      context 'when time_frame is "28d"' do
+        it 'returns an array with a keys for the last 4 full weeks' do
+          expect(event_selection_rule.redis_keys_for_time_frame('28d')).to eq(
+            [
+              "{event_counters}_an_event-filter:[label:foo]-2024-18",
+              "{event_counters}_an_event-filter:[label:foo]-2024-19",
+              "{event_counters}_an_event-filter:[label:foo]-2024-20",
+              "{event_counters}_an_event-filter:[label:foo]-2024-21"
+            ]
+          )
+        end
+      end
+    end
+  end
+
+  describe 'object equality - #eql' do
+    def expect_inequality(actual, other)
+      expect(actual.eql?(other)).to be_falsey
+      expect(actual).not_to eq(other)
+    end
+
+    def expect_equality(actual, other)
+      expect(actual).to eq(other)
+      expect(actual.eql?(other)).to be_truthy
+      expect(actual.hash).to eq(other.hash)
+    end
+
+    def make_new(name: 'an_event', time_framed: true, filter: { label: 'a_value' })
+      described_class.new(name: name, time_framed: time_framed, filter: filter)
+    end
+
+    it 'treats objects identical with identical attributes' do
+      expect_equality(make_new, make_new)
+    end
+
+    it 'different name leads to in-equality' do
+      expect_inequality(make_new, make_new(name: 'another_event'))
+    end
+
+    it 'different time_framed leads to in-equality' do
+      expect_inequality(make_new, make_new(time_framed: false))
+    end
+
+    it 'different filter leads to in-equality' do
+      expect_inequality(make_new, make_new(filter: {}))
+      expect_inequality(make_new, make_new(filter: { label: 'another_value' }))
+      expect_inequality(make_new, make_new(filter: { property: 'a_property' }))
+    end
+  end
+end
diff --git a/spec/lib/gitlab/usage/metrics/instrumentations/total_count_metric_spec.rb b/spec/lib/gitlab/usage/metrics/instrumentations/total_count_metric_spec.rb
index d001148519e..856ab185d8c 100644
--- a/spec/lib/gitlab/usage/metrics/instrumentations/total_count_metric_spec.rb
+++ b/spec/lib/gitlab/usage/metrics/instrumentations/total_count_metric_spec.rb
@@ -9,34 +9,36 @@ RSpec.describe Gitlab::Usage::Metrics::Instrumentations::TotalCountMetric, :clea
 
     event_definition = instance_double(
       Gitlab::Tracking::EventDefinition,
-      event_selection_rules: [{ name: 'my_event', time_framed?: false, filter: {} }]
+      event_selection_rules: [Gitlab::Usage::EventSelectionRule.new(name: 'my_event', time_framed: false)]
     )
     allow(Gitlab::Tracking::EventDefinition).to receive(:find).with('my_event').and_return(event_definition)
 
     event_definition1 = instance_double(
       Gitlab::Tracking::EventDefinition,
-      event_selection_rules: [{ name: 'my_event1', time_framed?: false, filter: {} }]
+      event_selection_rules: [Gitlab::Usage::EventSelectionRule.new(name: 'my_event1', time_framed: false)]
     )
     allow(Gitlab::Tracking::EventDefinition).to receive(:find).with('my_event1').and_return(event_definition1)
 
     event_definition2 = instance_double(
       Gitlab::Tracking::EventDefinition,
-      event_selection_rules: [{ name: 'my_event2', time_framed?: false, filter: {} }]
+      event_selection_rules: [Gitlab::Usage::EventSelectionRule.new(name: 'my_event2', time_framed: false)]
     )
     allow(Gitlab::Tracking::EventDefinition).to receive(:find).with('my_event2').and_return(event_definition2)
   end
 
   context 'with multiple similar events' do
+    let(:event_selection_rule) { Gitlab::Usage::EventSelectionRule.new(name: 'my_event', time_framed: true) }
+
     before do
       last_week = Date.today - 7.days
       two_weeks_ago = last_week - 1.week
 
-      redis_counter_key = described_class.redis_key('my_event', last_week)
+      redis_counter_key = event_selection_rule.redis_key_for_date(last_week)
       2.times do
         Gitlab::Redis::SharedState.with { |redis| redis.incr(redis_counter_key) }
       end
 
-      redis_counter_key = described_class.redis_key('my_event', two_weeks_ago)
+      redis_counter_key = event_selection_rule.redis_key_for_date(two_weeks_ago)
       3.times do
         Gitlab::Redis::SharedState.with { |redis| redis.incr(redis_counter_key) }
       end
@@ -67,26 +69,25 @@ RSpec.describe Gitlab::Usage::Metrics::Instrumentations::TotalCountMetric, :clea
 
   context 'with multiple different events' do
     let(:expected_value) { 2 }
+    let(:event_selection_rule1) { Gitlab::Usage::EventSelectionRule.new(name: 'my_event1', time_framed: true) }
+    let(:event_selection_rule2) { Gitlab::Usage::EventSelectionRule.new(name: 'my_event2', time_framed: true) }
 
     before do
       last_week = Date.today - 7.days
       two_weeks_ago = last_week - 1.week
 
       2.times do
-        redis_counter_key =
-          Gitlab::Usage::Metrics::Instrumentations::TotalCountMetric.redis_key('my_event1', last_week)
+        redis_counter_key = event_selection_rule1.redis_key_for_date(last_week)
         Gitlab::Redis::SharedState.with { |redis| redis.incr(redis_counter_key) }
       end
 
       3.times do
-        redis_counter_key =
-          Gitlab::Usage::Metrics::Instrumentations::TotalCountMetric.redis_key('my_event1', two_weeks_ago)
+        redis_counter_key = event_selection_rule1.redis_key_for_date(two_weeks_ago)
         Gitlab::Redis::SharedState.with { |redis| redis.incr(redis_counter_key) }
       end
 
       4.times do
-        redis_counter_key =
-          Gitlab::Usage::Metrics::Instrumentations::TotalCountMetric.redis_key('my_event2', last_week)
+        redis_counter_key = event_selection_rule2.redis_key_for_date(last_week)
         Gitlab::Redis::SharedState.with { |redis| redis.incr(redis_counter_key) }
       end
 
@@ -123,16 +124,4 @@ RSpec.describe Gitlab::Usage::Metrics::Instrumentations::TotalCountMetric, :clea
       expect { metric.value }.to raise_error(/Unknown time frame/)
     end
   end
-
-  describe '.redis_key' do
-    it 'adds the key prefix to the event name' do
-      expect(described_class.redis_key('my_event')).to eq('{event_counters}_my_event')
-    end
-
-    context "with a date" do
-      it 'adds the key prefix and suffix to the event name' do
-        expect(described_class.redis_key('my_event', Date.new(2023, 10, 19))).to eq("{event_counters}_my_event-2023-42")
-      end
-    end
-  end
 end
diff --git a/spec/models/ci/daily_build_group_report_result_spec.rb b/spec/models/ci/daily_build_group_report_result_spec.rb
index c9ec6b0beee..fdf05deafe6 100644
--- a/spec/models/ci/daily_build_group_report_result_spec.rb
+++ b/spec/models/ci/daily_build_group_report_result_spec.rb
@@ -53,7 +53,8 @@ RSpec.describe Ci::DailyBuildGroupReportResult, feature_category: :continuous_in
             last_pipeline_id: new_pipeline.id,
             date: rspec_coverage.date,
             group_name: 'rspec',
-            data: { 'coverage' => 81.0 }
+            data: { 'coverage' => 81.0 },
+            partition_id: 100
           },
           {
             project_id: rspec_coverage.project_id,
@@ -61,7 +62,8 @@ RSpec.describe Ci::DailyBuildGroupReportResult, feature_category: :continuous_in
             last_pipeline_id: new_pipeline.id,
             date: rspec_coverage.date,
             group_name: 'karma',
-            data: { 'coverage' => 87.0 }
+            data: { 'coverage' => 87.0 },
+            partition_id: 100
           }
         ])
 
diff --git a/spec/policies/packages/policies/dependency_proxy/group_policy_spec.rb b/spec/policies/packages/policies/dependency_proxy/group_policy_spec.rb
index f3d7ffb8159..f5c041e3c77 100644
--- a/spec/policies/packages/policies/dependency_proxy/group_policy_spec.rb
+++ b/spec/policies/packages/policies/dependency_proxy/group_policy_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Packages::Policies::DependencyProxy::GroupPolicy, feature_categor
   subject { described_class.new(auth_token, group.dependency_proxy_for_containers_policy_subject) }
 
   let_it_be(:guest) { create(:user) }
-  let_it_be(:non_group_member) { create(:user) }
+  let_it_be_with_reload(:non_group_member) { create(:user) }
   let_it_be(:group, refind: true) { create(:group, :private, :owner_subgroup_creation_only, guests: guest) }
   let_it_be(:current_user) { guest }
 
@@ -90,6 +90,30 @@ RSpec.describe Packages::Policies::DependencyProxy::GroupPolicy, feature_categor
           it_behaves_like 'allows dependency proxy read access'
         end
       end
+
+      context 'with all other user types' do
+        User::USER_TYPES.except(:human, :project_bot).each_value do |user_type|
+          context "with user_type #{user_type}" do
+            let_it_be(:auth_token) { create(:personal_access_token, user: non_group_member) }
+
+            before do
+              non_group_member.update!(user_type: user_type)
+            end
+
+            context 'when the user has sufficient access' do
+              before do
+                group.add_guest(non_group_member)
+              end
+
+              it_behaves_like 'allows dependency proxy read access'
+            end
+
+            context 'when the user does not have sufficient access' do
+              it_behaves_like 'disallows dependency proxy read access'
+            end
+          end
+        end
+      end
     end
   end
 end
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index 7e17346b3f9..72fd992e718 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -1000,6 +1000,10 @@ RSpec.describe API::Users, :aggregate_failures, feature_category: :user_manageme
   end
 
   describe 'GET /users/:id_or_username/status' do
+    before do
+      allow(::Gitlab::ApplicationRateLimiter).to receive(:throttled?).and_return(false)
+    end
+
     context 'when finding the user by id' do
       it_behaves_like 'rendering user status' do
         let(:path) { "/users/#{user.id}/status" }
@@ -1017,6 +1021,23 @@ RSpec.describe API::Users, :aggregate_failures, feature_category: :user_manageme
         let(:path) { "/users/#{user.username.upcase}/status" }
       end
     end
+
+    context 'when the rate limit has been reached' do
+      let(:path) { "/users/#{user.username.upcase}/status" }
+
+      before do
+        stub_feature_flags(rate_limiting_user_endpoints: true)
+      end
+
+      it 'returns status 429 Too Many Requests', :aggregate_failures do
+        ip = '1.2.3.4'
+        expect(::Gitlab::ApplicationRateLimiter).to receive(:throttled?).with(:user_status, scope: ip).and_return(true)
+
+        get api(path, user), env: { REMOTE_ADDR: ip }
+
+        expect(response).to have_gitlab_http_status(:too_many_requests)
+      end
+    end
   end
 
   describe 'POST /users/:id/follow' do
@@ -1146,6 +1167,10 @@ RSpec.describe API::Users, :aggregate_failures, feature_category: :user_manageme
     let(:followee) { create(:user) }
     let(:path) { "/users/#{user.id}/followers" }
 
+    before do
+      allow(::Gitlab::ApplicationRateLimiter).to receive(:throttled?).and_return(false)
+    end
+
     context 'for an anonymous user' do
       it 'returns 403' do
         get api("/users/#{user.id}")
@@ -1184,6 +1209,21 @@ RSpec.describe API::Users, :aggregate_failures, feature_category: :user_manageme
         expect(json_response).to be_empty
       end
     end
+
+    context 'when the rate limit has been reached' do
+      before do
+        stub_feature_flags(rate_limiting_user_endpoints: true)
+      end
+
+      it 'returns status 429 Too Many Requests', :aggregate_failures do
+        ip = '1.2.3.4'
+        expect(::Gitlab::ApplicationRateLimiter).to receive(:throttled?).with(:user_followers, scope: ip).and_return(true)
+
+        get api(path, user), env: { REMOTE_ADDR: ip }
+
+        expect(response).to have_gitlab_http_status(:too_many_requests)
+      end
+    end
   end
 
   describe "POST /users" do
@@ -2311,6 +2351,10 @@ RSpec.describe API::Users, :aggregate_failures, feature_category: :user_manageme
 
     let(:path) { "/users/#{user.id}/keys" }
 
+    before do
+      allow(::Gitlab::ApplicationRateLimiter).to receive(:throttled?).and_return(false)
+    end
+
     it 'returns 404 for non-existing user' do
       get api("/users/#{non_existing_record_id}/keys")
 
@@ -2358,11 +2402,26 @@ RSpec.describe API::Users, :aggregate_failures, feature_category: :user_manageme
         end.not_to exceed_all_query_limit(control)
       end
     end
+
+    context 'when the rate limit has been reached' do
+      it 'returns status 429 Too Many Requests', :aggregate_failures do
+        ip = '1.2.3.4'
+        expect(::Gitlab::ApplicationRateLimiter).to receive(:throttled?).with(:user_keys, scope: ip).and_return(true)
+
+        get api(path), env: { REMOTE_ADDR: ip }
+
+        expect(response).to have_gitlab_http_status(:too_many_requests)
+      end
+    end
   end
 
   describe 'GET /user/:user_id/keys' do
     let(:path) { "/users/#{user.username}/keys" }
 
+    before do
+      allow(::Gitlab::ApplicationRateLimiter).to receive(:throttled?).and_return(false)
+    end
+
     it 'returns 404 for non-existing user' do
       get api("/users/#{non_existing_record_id}/keys")
 
@@ -2380,11 +2439,26 @@ RSpec.describe API::Users, :aggregate_failures, feature_category: :user_manageme
       expect(json_response).to be_an Array
       expect(json_response.first['title']).to eq(key.title)
     end
+
+    context 'when the rate limit has been reached' do
+      it 'returns status 429 Too Many Requests', :aggregate_failures do
+        ip = '1.2.3.4'
+        expect(::Gitlab::ApplicationRateLimiter).to receive(:throttled?).with(:user_keys, scope: ip).and_return(true)
+
+        get api(path), env: { REMOTE_ADDR: ip }
+
+        expect(response).to have_gitlab_http_status(:too_many_requests)
+      end
+    end
   end
 
   describe 'GET /user/:id/keys/:key_id' do
     let(:path) { "/users/#{user.id}/keys/#{key.id}" }
 
+    before do
+      allow(::Gitlab::ApplicationRateLimiter).to receive(:throttled?).and_return(false)
+    end
+
     it 'gets existing key' do
       user.keys << key
 
@@ -2409,6 +2483,17 @@ RSpec.describe API::Users, :aggregate_failures, feature_category: :user_manageme
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 Key Not Found')
     end
+
+    context 'when the rate limit has been reached' do
+      it 'returns status 429 Too Many Requests', :aggregate_failures do
+        ip = '1.2.3.4'
+        expect(::Gitlab::ApplicationRateLimiter).to receive(:throttled?).with(:user_specific_key, scope: ip).and_return(true)
+
+        get api(path), env: { REMOTE_ADDR: ip }
+
+        expect(response).to have_gitlab_http_status(:too_many_requests)
+      end
+    end
   end
 
   describe 'DELETE /user/:id/keys/:key_id' do
@@ -2488,6 +2573,10 @@ RSpec.describe API::Users, :aggregate_failures, feature_category: :user_manageme
   describe 'GET /user/:id/gpg_keys' do
     let(:path) { "/users/#{user.id}/gpg_keys" }
 
+    before do
+      allow(::Gitlab::ApplicationRateLimiter).to receive(:throttled?).and_return(false)
+    end
+
     it 'returns 404 for non-existing user' do
       get api("/users/#{non_existing_record_id}/gpg_keys")
 
@@ -2505,11 +2594,26 @@ RSpec.describe API::Users, :aggregate_failures, feature_category: :user_manageme
       expect(json_response).to be_an Array
       expect(json_response.first['key']).to eq(gpg_key.key)
     end
+
+    context 'when the rate limit has been reached' do
+      it 'returns status 429 Too Many Requests', :aggregate_failures do
+        ip = '1.2.3.4'
+        expect(::Gitlab::ApplicationRateLimiter).to receive(:throttled?).with(:user_gpg_keys, scope: ip).and_return(true)
+
+        get api(path), env: { REMOTE_ADDR: ip }
+
+        expect(response).to have_gitlab_http_status(:too_many_requests)
+      end
+    end
   end
 
   describe 'GET /user/:id/gpg_keys/:key_id' do
     let(:path) { "/users/#{user.id}/gpg_keys/#{gpg_key.id}" }
 
+    before do
+      allow(::Gitlab::ApplicationRateLimiter).to receive(:throttled?).and_return(false)
+    end
+
     it 'returns 404 for non-existing user' do
       get api("/users/#{non_existing_record_id}/gpg_keys/1")
 
@@ -2532,6 +2636,17 @@ RSpec.describe API::Users, :aggregate_failures, feature_category: :user_manageme
       expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['key']).to eq(gpg_key.key)
     end
+
+    context 'when the rate limit has been reached' do
+      it 'returns status 429 Too Many Requests', :aggregate_failures do
+        ip = '1.2.3.4'
+        expect(::Gitlab::ApplicationRateLimiter).to receive(:throttled?).with(:user_specific_gpg_key, scope: ip).and_return(true)
+
+        get api(path), env: { REMOTE_ADDR: ip }
+
+        expect(response).to have_gitlab_http_status(:too_many_requests)
+      end
+    end
   end
 
   describe 'DELETE /user/:id/gpg_keys/:key_id' do
diff --git a/spec/requests/jwt_controller_spec.rb b/spec/requests/jwt_controller_spec.rb
index 539055d103e..ac7773c8486 100644
--- a/spec/requests/jwt_controller_spec.rb
+++ b/spec/requests/jwt_controller_spec.rb
@@ -364,6 +364,14 @@ RSpec.describe JwtController, feature_category: :system_access do
       it_behaves_like 'with valid credentials'
     end
 
+    context 'with job token' do
+      let_it_be_with_reload(:job) { create(:ci_build, user: user, status: :running, project: project) }
+      let_it_be(:credential_user) { 'gitlab-ci-token' }
+      let_it_be(:credential_password) { job.token }
+
+      it_behaves_like 'with valid credentials'
+    end
+
     context 'with project deploy token' do
       let(:credential_user) { project_deploy_token.username }
       let(:credential_password) { project_deploy_token.token }
diff --git a/spec/rubocop/cop/migration/background_migration_base_class_spec.rb b/spec/rubocop/cop/migration/batched_migration_base_class_spec.rb
similarity index 94%
rename from spec/rubocop/cop/migration/background_migration_base_class_spec.rb
rename to spec/rubocop/cop/migration/batched_migration_base_class_spec.rb
index fdd5f8d963e..3fa366036ea 100644
--- a/spec/rubocop/cop/migration/background_migration_base_class_spec.rb
+++ b/spec/rubocop/cop/migration/batched_migration_base_class_spec.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require 'rubocop_spec_helper'
-require_relative '../../../../rubocop/cop/migration/background_migration_base_class'
+require_relative '../../../../rubocop/cop/migration/batched_migration_base_class'
 
-RSpec.describe RuboCop::Cop::Migration::BackgroundMigrationBaseClass, feature_category: :database do
+RSpec.describe RuboCop::Cop::Migration::BatchedMigrationBaseClass, feature_category: :database do
   shared_examples_for 'inheritance from the right base class does not register an offense' do |base_class|
     context "when the migration class inherits from #{base_class}" do
       it 'does not register any offenses' do
diff --git a/spec/scripts/setup/generate_as_if_foss_env_spec.rb b/spec/scripts/setup/generate_as_if_foss_env_spec.rb
index fd880c9cb07..6e44dbb2a77 100644
--- a/spec/scripts/setup/generate_as_if_foss_env_spec.rb
+++ b/spec/scripts/setup/generate_as_if_foss_env_spec.rb
@@ -126,6 +126,29 @@ RSpec.describe GenerateAsIfFossEnv, feature_category: :tooling do
         ENABLE_RSPEC_PREDICTIVE_TRIGGER_SINGLE_DB_CI_CONNECTION: 'true'
       })
     end
+
+    context 'when there are only predictive frontend jobs' do
+      let(:jobs) do
+        [
+          'jest-integration',
+          'jest predictive 1/5',
+          'jest-with-fixtures predictive 1/2'
+        ]
+      end
+
+      let(:bridges) { [] }
+
+      it 'returns correct variables without ENABLE_JEST' do
+        expect(generate.variables).to eq({
+          START_AS_IF_FOSS: 'true',
+          RUBY_VERSION: ENV['RUBY_VERSION'],
+          FIND_CHANGES_MERGE_REQUEST_PROJECT_PATH: ENV['CI_MERGE_REQUEST_PROJECT_PATH'],
+          FIND_CHANGES_MERGE_REQUEST_IID: ENV['CI_MERGE_REQUEST_IID'],
+          ENABLE_JEST_INTEGRATION: 'true',
+          ENABLE_JEST_PREDICTIVE: 'true'
+        })
+      end
+    end
   end
 
   describe '#display' do
diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml
index 640802c0cad..d1e1f6b52f8 100644
--- a/spec/support/rspec_order_todo.yml
+++ b/spec/support/rspec_order_todo.yml
@@ -1642,7 +1642,6 @@
 - './ee/spec/models/geo/pages_deployment_registry_spec.rb'
 - './ee/spec/models/geo/pipeline_artifact_registry_spec.rb'
 - './ee/spec/models/geo/push_user_spec.rb'
-- './ee/spec/models/geo/repositories_changed_event_spec.rb'
 - './ee/spec/models/geo/secondary_usage_data_spec.rb'
 - './ee/spec/models/geo/snippet_repository_registry_spec.rb'
 - './ee/spec/models/geo/terraform_state_version_registry_spec.rb'