From 3e5162fc5b7b59cf69ba905d84a862b5b8eedf30 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 23 Jan 2025 12:29:34 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .rubocop_todo/lint/symbol_conversion.yml      |   1 -
 .../style/class_and_module_children.yml       |   1 -
 GITALY_SERVER_VERSION                         |   2 +-
 .../admin/jobs_table/admin_jobs_table_app.vue |   6 +-
 .../components/assigned_users.vue             |  48 +-
 .../pages/admin/jobs/index/index.js           |   4 +-
 .../components/project_delete_button.vue      |   5 +
 .../components/shared/delete_button.vue       |  10 +-
 .../projects/project_delete_button.js         |   2 +
 .../components/inbound_token_access.vue       |  48 +-
 .../javascripts/token_access/constants.js     |   3 +
 .../vue_shared/components/crud_component.vue  |   2 +-
 .../admin/application_settings_controller.rb  | 471 +++++++++---------
 app/controllers/admin/jobs_controller.rb      |   2 +
 .../oauth/authorizations_controller.rb        |   3 +
 .../projects/settings/ci_cd_controller.rb     |   1 +
 app/events/merge_requests/approved_event.rb   |   3 +-
 app/finders/ci/jobs_finder.rb                 |   2 +-
 app/helpers/admin/jobs_helper.rb              |  14 +
 app/helpers/projects_helper.rb                |  14 +-
 app/models/merge_request/approval_metrics.rb  |  24 +
 app/policies/global_policy.rb                 |   3 +
 ...ct_aggregate_pipeline_analytics_service.rb |   2 +-
 app/services/ci/register_job_service.rb       |  50 +-
 .../merge_requests/approval_service.rb        |   3 +-
 app/views/admin/jobs/index.html.haml          |   2 +-
 .../settings/_permanent_deletion.html.haml    |   4 +-
 .../groups/settings/_remove_button.html.haml  |   3 +-
 app/views/projects/_delete.html.haml          |   5 +-
 .../projects/_delete_immediately.html.haml    |   4 +-
 ...ntication_logs_migration_for_allowlist.yml |   9 +
 ...omatic_lock_writes_on_partition_tables.yml |   2 +-
 .../ops/automatic_lock_writes_on_table.yml    |   2 +-
 .../detect_cross_database_modification.yml    |   2 +-
 .../ops/lock_tables_in_monitoring.yml         |   2 +-
 .../ops/loose_foreign_keys_turbo_mode_ci.yml  |   2 +-
 .../loose_foreign_keys_turbo_mode_main.yml    |   2 +-
 .../ops/monitor_database_locked_tables.yml    |   2 +-
 .../query_analyzer_gitlab_schema_metrics.yml  |   2 +-
 ...olumn_information_on_statement_invalid.yml |   2 +-
 ...mplates_security_api_discovery_monthly.yml |   3 -
 .../20230217215050_ci_internal_pipelines.yml  |   3 -
 ..._entities_group_finished_with_failures.yml |   3 -
 ...tities_group_finished_without_failures.yml |   3 -
 ...ntities_project_finished_with_failures.yml |   3 -
 ...ties_project_finished_without_failures.yml |   3 -
 ...ithub_import_project_cancelled_monthly.yml |   3 -
 ...rt_project_partially_completed_monthly.yml |   3 -
 ...container_registry_writes_user_monthly.yml |   3 -
 ...0420160442_i_quickactions_type_monthly.yml |   3 -
 .../20230502171807_ci_interpolation_users.yml |   3 -
 ..._templates_security_bas_latest_monthly.yml |   3 -
 ...2402_p_ci_templates_pages_zola_monthly.yml |   3 -
 .../counts_28d/20230531170613_ci_builds.yml   |   3 -
 ..._jetbrains_bundled_api_request_monthly.yml |   3 -
 ...13085814_i_quickactions_unlink_monthly.yml |   3 -
 ...ts_unique_agents_via_ci_access_monthly.yml |   3 -
 ..._unique_agents_via_user_access_monthly.yml |   3 -
 ...sts_unique_users_via_ci_access_monthly.yml |   3 -
 ...s_unique_users_via_user_access_monthly.yml |   3 -
 ..._push_notified_unique_projects_monthly.yml |   3 -
 ...de_review_saved_replies_create_monthly.yml |   3 -
 ..._code_review_saved_replies_use_monthly.yml |   3 -
 ...review_saved_replies_use_in_mr_monthly.yml |   3 -
 ...157_count_cicd_component_usage_monthly.yml |   2 -
 ...iew_saved_replies_use_in_other_monthly.yml |   3 -
 ...s_unique_agents_via_pat_access_monthly.yml |   3 -
 ...ts_unique_users_via_pat_access_monthly.yml |   3 -
 ...30153031_p_ci_templates_cosign_monthly.yml |   3 -
 ...5305_i_quickactions_set_parent_monthly.yml |   3 -
 ...52527_i_quickactions_add_child_monthly.yml |   3 -
 ..._p_ci_templates_diffblue_cover_monthly.yml |   3 -
 ..._users_updating_work_item_todo_monthly.yml |   3 -
 ...registry_push_tag_deploy_token_monthly.yml |   3 -
 ...gistry_delete_tag_deploy_token_monthly.yml |   3 -
 ...y_push_repository_deploy_token_monthly.yml |   3 -
 ...delete_repository_deploy_token_monthly.yml |   3 -
 ...create_repository_deploy_token_monthly.yml |   3 -
 ...4_i_quickactions_remove_parent_monthly.yml |   3 -
 ...templates_opentofu_base_latest_monthly.yml |   3 -
 ...p_ci_templates_opentofu_latest_monthly.yml |   3 -
 ...27_i_quickactions_remove_child_monthly.yml |   3 -
 ...65317_i_quickactions_remind_me_monthly.yml |   3 -
 ...s_security_api_security_latest_monthly.yml |   3 -
 ...emplates_security_api_security_monthly.yml |   3 -
 ...t_label_from_render_glql_block_monthly.yml |   3 -
 ...amespace_id_from_pull_ml_model_monthly.yml |   3 -
 ...amespace_id_from_push_ml_model_monthly.yml |   3 -
 ..._ci_catalog_component_included_monthly.yml |   3 -
 ...oject_id_from_ci_template_included_28d.yml |   3 -
 ...oject_id_from_click_delete_pod_monthly.yml |   3 -
 ...om_create_ci_internal_pipeline_monthly.yml |   3 -
 ...ipeline_with_repository_source_monthly.yml |   3 -
 ...d_from_create_pages_deployment_monthly.yml |   3 -
 ...oject_id_from_create_wiki_page_monthly.yml |   3 -
 ...from_create_wiki_page_template_monthly.yml |   3 -
 ...oject_id_from_delete_wiki_page_monthly.yml |   3 -
 ...from_delete_wiki_page_template_monthly.yml |   3 -
 ...isable_inbound_job_token_scope_monthly.yml |   3 -
 ...enable_inbound_job_token_scope_monthly.yml |   3 -
 ...m_job_token_cross_project_auth_monthly.yml |   3 -
 ...om_job_token_same_project_auth_monthly.yml |   3 -
 ..._project_id_from_pull_ml_model_monthly.yml |   3 -
 ..._project_id_from_push_ml_model_monthly.yml |   3 -
 ..._id_from_register_agent_at_kas_monthly.yml |   3 -
 ...oject_id_from_update_wiki_page_monthly.yml |   3 -
 ...from_update_wiki_page_template_monthly.yml |   3 -
 ...project_id_from_view_wiki_page_monthly.yml |   3 -
 ...er_id_from_apply_wiki_template_monthly.yml |   3 -
 ...er_id_from_branch_rule_details_monthly.yml |   2 -
 ..._id_from_branch_rules_settings_monthly.yml |   2 -
 ...oped_search_to_advanced_search_monthly.yml |   3 -
 ...ick_blame_control_on_blob_page_monthly.yml |   3 -
 ...ck_blob_results_show_more_less_monthly.yml |   3 -
 ...click_chunk_blame_on_blob_page_monthly.yml |   3 -
 ...tton_in_multimatch_file_header_monthly.yml |   3 -
 ...ds_sub_menu_in_command_palette_monthly.yml |   3 -
 ...lter_toggle_bot_comments_in_mr_monthly.yml |   3 -
 ...ter_toggle_user_comments_in_mr_monthly.yml |   3 -
 ..._user_id_from_click_delete_pod_monthly.yml |   3 -
 ...click_expand_panel_on_settings_monthly.yml |   3 -
 ...ick_explore_in_command_palette_monthly.yml |   3 -
 ...ile_button_on_repository_pages_monthly.yml |   3 -
 ...quent_group_in_command_palette_monthly.yml |   3 -
 ...ent_project_in_command_palette_monthly.yml |   3 -
 ...from_click_go_to_file_shortcut_monthly.yml |   3 -
 ...roup_result_in_command_palette_monthly.yml |   3 -
 ...oped_search_to_advanced_search_monthly.yml |   3 -
 ...ick_header_link_of_blob_result_monthly.yml |   3 -
 ...k_history_control_on_blob_page_monthly.yml |   3 -
 ...ssue_result_in_command_palette_monthly.yml |   3 -
 ...igned_to_me_in_command_palette_monthly.yml |   3 -
 ...s_i_created_in_command_palette_monthly.yml |   3 -
 ...uest_result_in_command_palette_monthly.yml |   3 -
 ...igned_to_me_in_command_palette_monthly.yml |   3 -
 ...s_i_created_in_command_palette_monthly.yml |   3 -
 ..._a_reviewer_in_command_palette_monthly.yml |   3 -
 ...k_new_project_projects_explore_monthly.yml |   3 -
 ...ick_outside_of_command_palette_monthly.yml |   3 -
 ...preferences_in_command_palette_monthly.yml |   3 -
 ...ck_previous_blame_on_blob_page_monthly.yml |   3 -
 ...lick_print_as_pdf_in_wiki_page_monthly.yml |   3 -
 ...ick_profile_in_command_palette_monthly.yml |   3 -
 ...ject_result_in_command_palette_monthly.yml |   3 -
 ...oped_search_to_advanced_search_monthly.yml |   3 -
 ...ect_setting_in_command_palette_monthly.yml |   3 -
 ...epic_result_in_command_palette_monthly.yml |   3 -
 ...ssue_result_in_command_palette_monthly.yml |   3 -
 ...uest_result_in_command_palette_monthly.yml |   3 -
 ...ext_button_repository_settings_monthly.yml |   3 -
 ...lick_ref_selector_on_blob_page_monthly.yml |   3 -
 ...ex_button_in_search_page_input_monthly.yml |   3 -
 ...lob_button_repository_settings_monthly.yml |   3 -
 ..._search_blob_result_blame_line_monthly.yml |   3 -
 ..._click_search_blob_result_line_monthly.yml |   3 -
 ...on_to_activate_command_palette_monthly.yml |   3 -
 ...er_id_from_click_search_result_monthly.yml |   3 -
 ...rom_click_tab_projects_explore_monthly.yml |   3 -
 ...on_to_activate_command_palette_monthly.yml |   3 -
 ...ck_trigger_flux_reconciliation_monthly.yml |   3 -
 ...from_click_trigger_flux_resume_monthly.yml |   3 -
 ...rom_click_trigger_flux_suspend_monthly.yml |   3 -
 ...user_result_in_command_palette_monthly.yml |   3 -
 ...all_link_in_pipeline_analytics_monthly.yml |   3 -
 ...k_your_work_in_command_palette_monthly.yml |   3 -
 ...e_forks_on_search_results_page_monthly.yml |   3 -
 ...t_user_id_from_create_ci_build_monthly.yml |   3 -
 ...om_create_ci_internal_pipeline_monthly.yml |   3 -
 ...id_from_create_group_wiki_page_monthly.yml |   2 -
 ...d_from_create_pages_deployment_monthly.yml |   3 -
 ..._user_id_from_create_wiki_page_monthly.yml |   3 -
 ...from_create_wiki_page_template_monthly.yml |   3 -
 ...id_from_delete_group_wiki_page_monthly.yml |   2 -
 ..._user_id_from_delete_wiki_page_monthly.yml |   3 -
 ...from_delete_wiki_page_template_monthly.yml |   3 -
 ..._challenge_during_registration_monthly.yml |   3 -
 ...quickactions_remove_email_multiple_28d.yml |   3 -
 ...i_quickactions_remove_email_single_28d.yml |   3 -
 ..._dashboard_to_old_mr_dashboard_monthly.yml |   3 -
 ..._dashboard_to_new_mr_dashboard_monthly.yml |   3 -
 ...open_blame_viewer_on_blob_page_monthly.yml |   3 -
 ...en_kubernetes_resource_details_monthly.yml |   3 -
 ...s_at_symbol_in_command_palette_monthly.yml |   3 -
 ...press_colon_in_command_palette_monthly.yml |   3 -
 ...press_enter_to_advanced_search_monthly.yml |   3 -
 ...ress_escape_in_command_palette_monthly.yml |   3 -
 ...rward_slash_in_command_palette_monthly.yml |   3 -
 ...reater_than_in_command_palette_monthly.yml |   3 -
 ...ut_to_activate_command_palette_monthly.yml |   3 -
 ...user_id_from_render_glql_block_monthly.yml |   3 -
 ...e_filter_on_merge_request_page_monthly.yml |   3 -
 ...e_filter_on_merge_request_page_monthly.yml |   3 -
 ...m_unique_users_visiting_ci_catalog_28d.yml |   3 -
 ...id_from_update_group_wiki_page_monthly.yml |   2 -
 ..._user_id_from_update_wiki_page_monthly.yml |   3 -
 ...from_update_wiki_page_template_monthly.yml |   3 -
 ...se_filter_bar_projects_explore_monthly.yml |   3 -
 ...se_pagination_projects_explore_monthly.yml |   3 -
 ...from_use_sort_projects_explore_monthly.yml |   3 -
 ...clicks_comment_filter_dropdown_monthly.yml |   3 -
 ...w_admin_abuse_reports_pageload_monthly.yml |   3 -
 ...tings_advanced_search_pageload_monthly.yml |   3 -
 ...on_settings_analytics_pageload_monthly.yml |   3 -
 ...n_settings_appearance_pageload_monthly.yml |   3 -
 ...cation_settings_ci_cd_pageload_monthly.yml |   3 -
 ...tion_settings_general_pageload_monthly.yml |   3 -
 ...settings_integrations_pageload_monthly.yml |   3 -
 ...tion_settings_network_pageload_monthly.yml |   3 -
 ..._settings_preferences_pageload_monthly.yml |   3 -
 ...on_settings_reporting_pageload_monthly.yml |   3 -
 ...n_settings_repository_pageload_monthly.yml |   3 -
 ...on_settings_templates_pageload_monthly.yml |   3 -
 ...ew_admin_applications_pageload_monthly.yml |   3 -
 ...view_admin_audit_logs_pageload_monthly.yml |   3 -
 ...admin_background_jobs_pageload_monthly.yml |   3 -
 ...background_migrations_pageload_monthly.yml |   3 -
 ...in_broadcast_messages_pageload_monthly.yml |   3 -
 ...iew_admin_credentials_pageload_monthly.yml |   3 -
 ..._view_admin_dashboard_pageload_monthly.yml |   3 -
 ...iew_admin_deploy_keys_pageload_monthly.yml |   3 -
 ...admin_dev_ops_reports_pageload_monthly.yml |   3 -
 ...ew_admin_geo_settings_pageload_monthly.yml |   3 -
 ..._view_admin_geo_sites_pageload_monthly.yml |   3 -
 ..._admin_gitaly_servers_pageload_monthly.yml |   3 -
 ...rom_view_admin_groups_pageload_monthly.yml |   3 -
 ...ew_admin_health_check_pageload_monthly.yml |   3 -
 ...from_view_admin_hooks_pageload_monthly.yml |   3 -
 ..._from_view_admin_jobs_pageload_monthly.yml |   3 -
 ...rom_view_admin_labels_pageload_monthly.yml |   3 -
 ...m_view_admin_projects_pageload_monthly.yml |   3 -
 ..._view_admin_push_rule_pageload_monthly.yml |   3 -
 ...om_view_admin_runners_pageload_monthly.yml |   3 -
 ...ew_admin_subscription_pageload_monthly.yml |   3 -
 ...iew_admin_system_info_pageload_monthly.yml |   3 -
 ...rom_view_admin_topics_pageload_monthly.yml |   3 -
 ...ew_admin_usage_trends_pageload_monthly.yml |   3 -
 ...from_view_admin_users_pageload_monthly.yml |   3 -
 ...ct_user_id_from_view_wiki_page_monthly.yml |   3 -
 ...metrics_and_profiling_pageload_monthly.yml |   3 -
 ...roles_and_permissions_pageload_monthly.yml |   3 -
 ...gs_sec_and_compliance_pageload_monthly.yml |   3 -
 ...lter_toggle_bot_comments_in_mr_monthly.yml |   3 -
 ...ter_toggle_user_comments_in_mr_monthly.yml |   3 -
 ..._commit_change_to_ciconfigfile_monthly.yml |   3 -
 .../count_total_create_ci_build_monthly.yml   |   3 -
 ...al_create_ci_internal_pipeline_monthly.yml |   3 -
 ...nternal_pipeline_with_schedule_monthly.yml |   3 -
 ...nternal_with_repository_source_monthly.yml |   3 -
 ...t_total_create_group_wiki_page_monthly.yml |   2 -
 ...t_total_delete_group_wiki_page_monthly.yml |   2 -
 ...expand_description_on_workitem_monthly.yml |   3 -
 ...uickactions_add_email_multiple_monthly.yml |   3 -
 ..._quickactions_add_email_single_monthly.yml |   3 -
 ...quickactions_convert_to_ticket_monthly.yml |   3 -
 ...k_add_to_review_on_changes_tab_monthly.yml |   3 -
 ..._add_to_review_on_overview_tab_monthly.yml |   3 -
 ...ck_start_review_on_changes_tab_monthly.yml |   3 -
 ...k_start_review_on_overview_tab_monthly.yml |   3 -
 ...al_model_registry_ml_model_created_28d.yml |   3 -
 ..._registry_ml_model_version_created_28d.yml |   3 -
 ..._total_package_ml_model_pulled_monthly.yml |   3 -
 ..._total_package_ml_model_pushed_monthly.yml |   3 -
 ...push_package_to_registry_conan_monthly.yml |   3 -
 ...sh_package_to_registry_generic_monthly.yml |   3 -
 ...ush_package_to_registry_golang_monthly.yml |   3 -
 ..._push_package_to_registry_helm_monthly.yml |   3 -
 ...push_package_to_registry_maven_monthly.yml |   3 -
 ...total_push_package_to_registry_monthly.yml |   3 -
 ...l_push_package_to_registry_npm_monthly.yml |   3 -
 ...push_package_to_registry_nuget_monthly.yml |   3 -
 ..._push_package_to_registry_pypi_monthly.yml |   3 -
 ...l_push_package_to_registry_rpm_monthly.yml |   3 -
 ...h_package_to_registry_rubygems_monthly.yml |   3 -
 ...e_to_registry_terraform_module_monthly.yml |   3 -
 ...nt_total_register_agent_at_kas_monthly.yml |   3 -
 ..._request_service_ping_via_rest_monthly.yml |   3 -
 ...en_kubernetes_resource_details_monthly.yml |   3 -
 ..._created_with_maintenance_note_monthly.yml |   3 -
 ...t_total_update_group_wiki_page_monthly.yml |   2 -
 ...l_use_run_keyword_in_cicd_yaml_monthly.yml |   3 -
 ...clicks_comment_filter_dropdown_monthly.yml |   3 -
 ...w_admin_abuse_reports_pageload_monthly.yml |   3 -
 ...tings_advanced_search_pageload_monthly.yml |   3 -
 ...on_settings_analytics_pageload_monthly.yml |   3 -
 ...n_settings_appearance_pageload_monthly.yml |   3 -
 ...cation_settings_ci_cd_pageload_monthly.yml |   3 -
 ...tion_settings_general_pageload_monthly.yml |   3 -
 ...settings_integrations_pageload_monthly.yml |   3 -
 ...metrics_and_profiling_pageload_monthly.yml |   3 -
 ...tion_settings_network_pageload_monthly.yml |   3 -
 ..._settings_preferences_pageload_monthly.yml |   3 -
 ...on_settings_reporting_pageload_monthly.yml |   3 -
 ...n_settings_repository_pageload_monthly.yml |   3 -
 ...roles_and_permissions_pageload_monthly.yml |   3 -
 ...curity_and_compliance_pageload_monthly.yml |   3 -
 ...on_settings_templates_pageload_monthly.yml |   3 -
 ...ew_admin_applications_pageload_monthly.yml |   3 -
 ...view_admin_audit_logs_pageload_monthly.yml |   3 -
 ...admin_background_jobs_pageload_monthly.yml |   3 -
 ...background_migrations_pageload_monthly.yml |   3 -
 ...in_broadcast_messages_pageload_monthly.yml |   3 -
 ...iew_admin_credentials_pageload_monthly.yml |   3 -
 ..._view_admin_dashboard_pageload_monthly.yml |   3 -
 ...iew_admin_deploy_keys_pageload_monthly.yml |   3 -
 ...admin_dev_ops_reports_pageload_monthly.yml |   3 -
 ...ew_admin_geo_settings_pageload_monthly.yml |   3 -
 ..._view_admin_geo_sites_pageload_monthly.yml |   3 -
 ..._admin_gitaly_servers_pageload_monthly.yml |   3 -
 ...tal_view_admin_groups_pageload_monthly.yml |   3 -
 ...ew_admin_health_check_pageload_monthly.yml |   3 -
 ...otal_view_admin_hooks_pageload_monthly.yml |   3 -
 ...total_view_admin_jobs_pageload_monthly.yml |   3 -
 ...tal_view_admin_labels_pageload_monthly.yml |   3 -
 ...l_view_admin_projects_pageload_monthly.yml |   3 -
 ..._view_admin_push_rule_pageload_monthly.yml |   3 -
 ...al_view_admin_runners_pageload_monthly.yml |   3 -
 ...ew_admin_subscription_pageload_monthly.yml |   3 -
 ...iew_admin_system_info_pageload_monthly.yml |   3 -
 ...tal_view_admin_topics_pageload_monthly.yml |   3 -
 ...ew_admin_usage_trends_pageload_monthly.yml |   3 -
 ...otal_view_admin_users_pageload_monthly.yml |   3 -
 config/sidekiq_queues.yml                     |   2 +
 db/docs/merge_request_approval_metrics.yml    |  14 +
 ...7_create_merge_request_approval_metrics.rb |  22 +
 ...n_key_to_merge_request_approval_metrics.rb |  19 +
 db/schema_migrations/20241217100247           |   1 +
 db/schema_migrations/20250114084738           |   1 +
 db/structure.sql                              |  19 +
 doc/administration/admin_area.md              |   2 +-
 doc/administration/instance_limits.md         |   2 +-
 .../invalidate_markdown_cache.md              |   2 +-
 doc/administration/review_abuse_reports.md    |   2 +-
 .../settings/account_and_limit_settings.md    |   3 +-
 .../settings/import_and_export_settings.md    |   2 +-
 .../settings/push_event_activities_limit.md   |   2 +-
 .../settings/security_contact_information.md  |   2 +-
 .../settings/sign_in_restrictions.md          |   2 +-
 doc/administration/snippets/index.md          |   4 +-
 doc/administration/user_settings.md           |   2 +-
 doc/administration/wikis/index.md             |   6 +-
 doc/api/appearance.md                         |  45 +-
 doc/api/group_import_export.md                |   2 +-
 doc/api/project_import_export.md              |   4 +-
 doc/api/rest/deprecations.md                  |   2 +-
 doc/api/settings.md                           |  42 +-
 doc/api/statistics.md                         |  16 +-
 doc/security/hardening_nist_800_53.md         |   2 +-
 doc/security/two_factor_authentication.md     |   2 +-
 doc/security/unlock_user.md                   |   2 +-
 doc/topics/autodevops/customize.md            |   2 +-
 doc/user/asciidoc.md                          |   2 +-
 doc/user/markdown.md                          |   2 +-
 doc/user/packages/package_registry/index.md   |   4 +-
 doc/user/profile/personal_access_tokens.md    |   2 +-
 doc/user/profile/preferences.md               |   2 +-
 doc/user/project/codeowners/reference.md      |  45 +-
 .../img/direct_group_members_v17_9.png        | Bin 0 -> 30845 bytes
 .../img/merge_request_maintainers_v17_9.png   | Bin 0 -> 9694 bytes
 doc/user/project/integrations/index.md        |   2 +-
 .../project/integrations/webhook_events.md    |   4 +-
 doc/user/project/settings/import_export.md    |   4 +-
 .../overdue_finalize_background_migration.rb  |  29 +-
 locale/gitlab.pot                             |  77 ++-
 .../formatters/allure_metadata_formatter.rb   |  25 +-
 .../allure_metadata_formatter_spec.rb         |  28 +-
 .../oauth/authorizations_controller_spec.rb   |  19 +
 .../merge_request_approval_metrics.rb         |   9 +
 .../jobs_table/admin_job_table_app_spec.js    |  35 +-
 .../__snapshots__/assigned_users_spec.js.snap |   8 +-
 .../components/assigned_users_spec.js         |  39 --
 .../table/admin_job_table_app_spec.js         |  35 +-
 .../components/project_delete_button_spec.js  |   2 +
 .../components/shared/delete_button_spec.js   |  19 +-
 .../token_access/inbound_token_access_spec.js |  58 ++-
 .../components/crud_component_spec.js         |  11 +
 spec/helpers/admin/jobs_helper_spec.rb        |  27 +
 spec/helpers/projects_helper_spec.rb          |  26 +-
 ...rdue_finalize_background_migration_spec.rb |  47 ++
 .../merge_request/approval_metrics_spec.rb    |  69 +++
 spec/policies/global_policy_spec.rb           |  12 +
 .../project_pipeline_statistics_spec.rb       |  10 +-
 ...gregate_pipeline_analytics_service_spec.rb |   2 +-
 spec/services/ci/register_job_service_spec.rb |  10 +-
 .../merge_requests/approval_service_spec.rb   |   4 +-
 .../auto_merge_from_event_shared_examples.rb  |   2 +-
 .../create_approval_event_worker_spec.rb      |   2 +-
 .../create_approval_note_worker_spec.rb       |   2 +-
 .../execute_approval_hooks_worker_spec.rb     |   2 +-
 ...ocess_auto_merge_from_event_worker_spec.rb |   2 +-
 ...esolve_todos_after_approval_worker_spec.rb |   2 +-
 390 files changed, 1102 insertions(+), 1409 deletions(-)
 create mode 100644 app/helpers/admin/jobs_helper.rb
 create mode 100644 app/models/merge_request/approval_metrics.rb
 create mode 100644 config/feature_flags/gitlab_com_derisk/authentication_logs_migration_for_allowlist.yml
 create mode 100644 db/docs/merge_request_approval_metrics.yml
 create mode 100644 db/migrate/20241217100247_create_merge_request_approval_metrics.rb
 create mode 100644 db/migrate/20250114084738_add_target_project_foreign_key_to_merge_request_approval_metrics.rb
 create mode 100644 db/schema_migrations/20241217100247
 create mode 100644 db/schema_migrations/20250114084738
 create mode 100644 doc/user/project/img/direct_group_members_v17_9.png
 create mode 100644 doc/user/project/img/merge_request_maintainers_v17_9.png
 create mode 100644 spec/factories/merge_request_approval_metrics.rb
 create mode 100644 spec/helpers/admin/jobs_helper_spec.rb
 create mode 100644 spec/models/merge_request/approval_metrics_spec.rb

diff --git a/.rubocop_todo/lint/symbol_conversion.yml b/.rubocop_todo/lint/symbol_conversion.yml
index 6f4e4b99018..353293d9fe5 100644
--- a/.rubocop_todo/lint/symbol_conversion.yml
+++ b/.rubocop_todo/lint/symbol_conversion.yml
@@ -2,7 +2,6 @@
 # Cop supports --autocorrect.
 Lint/SymbolConversion:
   Exclude:
-    - 'app/controllers/admin/application_settings_controller.rb'
     - 'app/controllers/groups_controller.rb'
     - 'app/controllers/projects/issues_controller.rb'
     - 'app/controllers/projects_controller.rb'
diff --git a/.rubocop_todo/style/class_and_module_children.yml b/.rubocop_todo/style/class_and_module_children.yml
index 5bc2bcf638d..aef144c5f15 100644
--- a/.rubocop_todo/style/class_and_module_children.yml
+++ b/.rubocop_todo/style/class_and_module_children.yml
@@ -6,7 +6,6 @@ Style/ClassAndModuleChildren:
     - 'app/controllers/admin/abuse_reports_controller.rb'
     - 'app/controllers/admin/application_controller.rb'
     - 'app/controllers/admin/application_settings/appearances_controller.rb'
-    - 'app/controllers/admin/application_settings_controller.rb'
     - 'app/controllers/admin/applications_controller.rb'
     - 'app/controllers/admin/clusters_controller.rb'
     - 'app/controllers/admin/cohorts_controller.rb'
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 4d4bae95e57..4a23e6689b9 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-0be460967aff73c3ce3262e840bee3dc6ed289f5
+6dc57705f4d70c87ea803faa572e5bb844cbc569
diff --git a/app/assets/javascripts/ci/admin/jobs_table/admin_jobs_table_app.vue b/app/assets/javascripts/ci/admin/jobs_table/admin_jobs_table_app.vue
index dc5528d4e4d..ed07dc4a397 100644
--- a/app/assets/javascripts/ci/admin/jobs_table/admin_jobs_table_app.vue
+++ b/app/assets/javascripts/ci/admin/jobs_table/admin_jobs_table_app.vue
@@ -60,6 +60,10 @@ export default {
       default: '',
       required: false,
     },
+    canUpdateAllJobs: {
+      default: false,
+      required: true,
+    },
   },
   apollo: {
     jobs: {
@@ -240,7 +244,7 @@ export default {
     <jobs-table-tabs
       :all-jobs-count="count"
       :loading="loading"
-      :show-cancel-all-jobs-button="isCancelable"
+      :show-cancel-all-jobs-button="canUpdateAllJobs && isCancelable"
       @fetchJobsByStatus="fetchJobsByStatus"
     />
 
diff --git a/app/assets/javascripts/merge_request_dashboard/components/assigned_users.vue b/app/assets/javascripts/merge_request_dashboard/components/assigned_users.vue
index 8f907ab9add..d793b8e3335 100644
--- a/app/assets/javascripts/merge_request_dashboard/components/assigned_users.vue
+++ b/app/assets/javascripts/merge_request_dashboard/components/assigned_users.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlIcon, GlAvatarsInline, GlAvatarLink, GlAvatar, GlTooltipDirective } from '@gitlab/ui';
-import { __, n__, sprintf } from '~/locale';
+import { n__ } from '~/locale';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { swapArrayItems } from '~/lib/utils/array_utility';
 import { isCurrentUser } from '~/lib/utils/common_utils';
@@ -28,15 +28,6 @@ const REVIEW_STATE_ICONS = {
     foregroundClass: 'gl-fill-status-neutral',
   },
 };
-const USER_TOOLTIP_TITLES = {
-  ASSIGNEES: __('%{strongStart}%{you}%{strongEnd}%{break}Assigned to %{name}'),
-  REQUESTED_CHANGES: __('%{strongStart}%{you}%{strongEnd}%{break}%{name} requested changes'),
-  REVIEWED: __('%{strongStart}%{you}%{strongEnd}%{break}%{name} left feedback'),
-  APPROVED: __('%{strongStart}%{you}%{strongEnd}%{break}Approved by %{name}'),
-  UNREVIEWED: __('%{strongStart}%{you}%{strongEnd}%{break}Review requested from %{name}'),
-  REVIEW_STARTED: __('%{strongStart}%{you}%{strongEnd}%{break}%{name} started a review'),
-  default: __('%{strongStart}%{you}%{strongEnd}%{break}Review requested from %{name}'),
-};
 
 export default {
   components: {
@@ -86,36 +77,15 @@ export default {
     },
   },
   methods: {
+    userId(user) {
+      return getIdFromGraphQLId(user.id);
+    },
     isCurrentUser(user) {
-      return !this.newListsEnabled && isCurrentUser(getIdFromGraphQLId(user.id));
+      return isCurrentUser(getIdFromGraphQLId(user.id));
     },
     reviewStateIcon(user) {
       return REVIEW_STATE_ICONS[user.mergeRequestInteraction?.reviewState];
     },
-    tooltipTitle(user) {
-      const currentUser = this.isCurrentUser(user);
-      const thisIsYouText = currentUser ? __('This is you.') : '';
-
-      let titleType;
-
-      if (this.type === 'ASSIGNEES') {
-        titleType = this.type;
-      } else if (user.mergeRequestInteraction?.reviewState) {
-        titleType = user.mergeRequestInteraction.reviewState;
-      }
-
-      return sprintf(
-        USER_TOOLTIP_TITLES[titleType] || USER_TOOLTIP_TITLES.default,
-        {
-          name: user.name,
-          you: thisIsYouText,
-          break: currentUser ? '<br />' : '',
-          strongStart: currentUser ? '<strong>' : '',
-          strongEnd: currentUser ? '</strong>' : '',
-        },
-        false,
-      );
-    },
   },
   MAX_VISIBLE_USERS,
   REVIEW_STATE_ICONS,
@@ -135,15 +105,17 @@ export default {
     >
       <template #avatar="{ avatar: user }">
         <gl-avatar-link
-          v-gl-tooltip.viewport.top.html="tooltipTitle(user)"
+          :data-name="user.name"
+          :data-user-id="userId(user)"
+          :data-username="user.username"
           target="blank"
           :href="user.webUrl"
-          class="gl-relative"
+          class="js-user-link gl-relative"
           data-testid="assigned-user"
         >
           <gl-avatar :src="user.avatarUrl" :size="32" class="!gl-bg-white" />
           <span
-            v-if="isCurrentUser(user)"
+            v-if="!newListsEnabled && isCurrentUser(user)"
             class="gl-absolute -gl-left-2 -gl-top-2 gl-flex gl-h-5 gl-w-5 gl-items-center gl-justify-center gl-rounded-full gl-bg-blue-500 gl-p-1 gl-text-white"
             data-testid="current-user"
           >
diff --git a/app/assets/javascripts/pages/admin/jobs/index/index.js b/app/assets/javascripts/pages/admin/jobs/index/index.js
index 52e4d5dd19f..35d5526c1d4 100644
--- a/app/assets/javascripts/pages/admin/jobs/index/index.js
+++ b/app/assets/javascripts/pages/admin/jobs/index/index.js
@@ -2,6 +2,7 @@ import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import Translate from '~/vue_shared/translate';
 import createDefaultClient from '~/lib/graphql';
+import { parseBoolean } from '~/lib/utils/common_utils';
 import AdminJobsTableApp from '~/ci/admin/jobs_table/admin_jobs_table_app.vue';
 import cacheConfig from '~/ci/admin/jobs_table/graphql/cache_config';
 
@@ -19,7 +20,7 @@ const initAdminJobsApp = () => {
 
   if (!containerEl) return false;
 
-  const { jobStatuses, emptyStateSvgPath, url } = containerEl.dataset;
+  const { jobStatuses, emptyStateSvgPath, url, canUpdateAllJobs } = containerEl.dataset;
 
   return new Vue({
     el: containerEl,
@@ -28,6 +29,7 @@ const initAdminJobsApp = () => {
       url,
       emptyStateSvgPath,
       jobStatuses: JSON.parse(jobStatuses),
+      canUpdateAllJobs: parseBoolean(canUpdateAllJobs),
     },
     render(createElement) {
       return createElement(AdminJobsTableApp);
diff --git a/app/assets/javascripts/projects/components/project_delete_button.vue b/app/assets/javascripts/projects/components/project_delete_button.vue
index 924b6f55db4..5a190be5911 100644
--- a/app/assets/javascripts/projects/components/project_delete_button.vue
+++ b/app/assets/javascripts/projects/components/project_delete_button.vue
@@ -34,6 +34,10 @@ export default {
       type: Number,
       required: true,
     },
+    buttonText: {
+      type: String,
+      required: true,
+    },
   },
 };
 </script>
@@ -47,5 +51,6 @@ export default {
     :merge-requests-count="mergeRequestsCount"
     :forks-count="forksCount"
     :stars-count="starsCount"
+    :button-text="buttonText"
   />
 </template>
diff --git a/app/assets/javascripts/projects/components/shared/delete_button.vue b/app/assets/javascripts/projects/components/shared/delete_button.vue
index b290b2b085f..bb92f8569d0 100644
--- a/app/assets/javascripts/projects/components/shared/delete_button.vue
+++ b/app/assets/javascripts/projects/components/shared/delete_button.vue
@@ -39,6 +39,11 @@ export default {
       type: Number,
       required: true,
     },
+    buttonText: {
+      type: String,
+      required: false,
+      default: __('Delete project'),
+    },
   },
   data() {
     return {
@@ -58,9 +63,6 @@ export default {
       this.isModalVisible = true;
     },
   },
-  i18n: {
-    deleteProject: __('Delete project'),
-  },
 };
 </script>
 
@@ -89,7 +91,7 @@ export default {
       variant="danger"
       data-testid="delete-button"
       @click="onButtonClick"
-      >{{ $options.i18n.deleteProject }}</gl-button
+      >{{ buttonText }}</gl-button
     >
   </gl-form>
 </template>
diff --git a/app/assets/javascripts/projects/project_delete_button.js b/app/assets/javascripts/projects/project_delete_button.js
index b4d388eda3a..c2293ec675b 100644
--- a/app/assets/javascripts/projects/project_delete_button.js
+++ b/app/assets/javascripts/projects/project_delete_button.js
@@ -15,6 +15,7 @@ export default (selector = '#js-project-delete-button') => {
     mergeRequestsCount,
     forksCount,
     starsCount,
+    buttonText,
   } = el.dataset;
 
   // eslint-disable-next-line no-new
@@ -30,6 +31,7 @@ export default (selector = '#js-project-delete-button') => {
           mergeRequestsCount: parseInt(mergeRequestsCount, 10),
           forksCount: parseInt(forksCount, 10),
           starsCount: parseInt(starsCount, 10),
+          buttonText,
         },
       });
     },
diff --git a/app/assets/javascripts/token_access/components/inbound_token_access.vue b/app/assets/javascripts/token_access/components/inbound_token_access.vue
index 6ad02fedefa..b927483ade5 100644
--- a/app/assets/javascripts/token_access/components/inbound_token_access.vue
+++ b/app/assets/javascripts/token_access/components/inbound_token_access.vue
@@ -2,8 +2,9 @@
 import {
   GlAlert,
   GlButton,
-  GlLink,
+  GlCollapsibleListbox,
   GlIcon,
+  GlLink,
   GlLoadingIcon,
   GlSprintf,
   GlTooltipDirective,
@@ -22,6 +23,10 @@ import inboundUpdateCIJobTokenScopeMutation from '../graphql/mutations/inbound_u
 import inboundGetCIJobTokenScopeQuery from '../graphql/queries/inbound_get_ci_job_token_scope.query.graphql';
 import inboundGetGroupsAndProjectsWithCIJobTokenScopeQuery from '../graphql/queries/inbound_get_groups_and_projects_with_ci_job_token_scope.query.graphql';
 import getCiJobTokenScopeAllowlistQuery from '../graphql/queries/get_ci_job_token_scope_allowlist.query.graphql';
+import {
+  JOB_TOKEN_FORM_ADD_GROUP_OR_PROJECT,
+  JOB_TOKEN_FORM_AUTOPOPULATE_AUTH_LOG,
+} from '../constants';
 import TokenAccessTable from './token_access_table.vue';
 import NamespaceForm from './namespace_form.vue';
 
@@ -38,6 +43,7 @@ export default {
     settingDisabledMessage: s__(
       'CICD|Access unrestricted, so users with sufficient permissions in this project can authenticate with a job token generated in any other project.',
     ),
+    add: __('Add'),
     addGroupOrProject: __('Add group or project'),
     projectsFetchError: __('There was a problem fetching the projects'),
     scopeFetchError: __('There was a problem fetching the job token scope value'),
@@ -58,11 +64,22 @@ export default {
       text: s__('CICD|Only this project and any groups and projects in the allowlist'),
     },
   ],
+  crudFormActions: [
+    {
+      text: __('Group or project'),
+      value: JOB_TOKEN_FORM_ADD_GROUP_OR_PROJECT,
+    },
+    {
+      text: __('All projects in authentication log'),
+      value: JOB_TOKEN_FORM_AUTOPOPULATE_AUTH_LOG,
+    },
+  ],
   components: {
     GlAlert,
     GlButton,
-    GlLink,
+    GlCollapsibleListbox,
     GlIcon,
+    GlLink,
     GlLoadingIcon,
     GlSprintf,
     CrudComponent,
@@ -132,6 +149,7 @@ export default {
       projectName: '',
       namespaceToEdit: null,
       namespaceToRemove: null,
+      selectedAction: null,
     };
   },
   computed: {
@@ -147,6 +165,9 @@ export default {
       const { groups, projects } = this.groupsAndProjectsWithAccess;
       return [...groups, ...projects];
     },
+    canAutopopulateAuthLog() {
+      return this.glFeatures.authenticationLogsMigrationForAllowlist;
+    },
     groupCount() {
       return this.groupsAndProjectsWithAccess.groups.length;
     },
@@ -169,6 +190,10 @@ export default {
     },
   },
   methods: {
+    hideSelectedAction() {
+      this.namespaceToEdit = null;
+      this.selectedAction = null;
+    },
     mapAllowlistNodes(list) {
       // The defaultPermissions and jobTokenPolicies are separate fields from the target (the group or project in the
       // allowlist). Combine them into a single object.
@@ -235,6 +260,11 @@ export default {
     refetchGroupsAndProjects() {
       this.$apollo.queries.groupsAndProjectsWithAccess.refetch();
     },
+    selectAction(action, showFormFn) {
+      // TODO: render autopopulate modal when selected
+      this.selectedAction = action;
+      showFormFn();
+    },
     showNamespaceForm(namespace, showFormFn) {
       this.namespaceToEdit = namespace;
       showFormFn();
@@ -289,10 +319,20 @@ export default {
       <crud-component
         :title="$options.i18n.cardHeaderTitle"
         :description="$options.i18n.cardHeaderDescription"
-        :toggle-text="$options.i18n.addGroupOrProject"
+        :toggle-text="!canAutopopulateAuthLog ? $options.i18n.addGroupOrProject : undefined"
         class="gl-mt-5"
-        @hideForm="namespaceToEdit = null"
+        @hideForm="hideSelectedAction"
       >
+        <template v-if="canAutopopulateAuthLog" #actions="{ showForm }">
+          <gl-collapsible-listbox
+            v-model="selectedAction"
+            :items="$options.crudFormActions"
+            :toggle-text="$options.i18n.add"
+            data-testid="form-selector"
+            size="small"
+            @select="selectAction($event, showForm)"
+          />
+        </template>
         <template #count>
           <gl-loading-icon v-if="isAllowlistLoading" data-testid="count-loading-icon" />
           <template v-else>
diff --git a/app/assets/javascripts/token_access/constants.js b/app/assets/javascripts/token_access/constants.js
index 46f0e443ac4..80c013b2ed4 100644
--- a/app/assets/javascripts/token_access/constants.js
+++ b/app/assets/javascripts/token_access/constants.js
@@ -145,3 +145,6 @@ export const JOB_TOKEN_POLICIES = keyBy(
   POLICIES_BY_RESOURCE.flatMap(({ policies }) => policies),
   ({ value }) => value,
 );
+
+export const JOB_TOKEN_FORM_ADD_GROUP_OR_PROJECT = 'JOB_TOKEN_FORM_ADD_GROUP_OR_PROJECT';
+export const JOB_TOKEN_FORM_AUTOPOPULATE_AUTH_LOG = 'JOB_TOKEN_FORM_AUTOPOPULATE_AUTH_LOG';
diff --git a/app/assets/javascripts/vue_shared/components/crud_component.vue b/app/assets/javascripts/vue_shared/components/crud_component.vue
index aa97eca6141..671f4f25362 100644
--- a/app/assets/javascripts/vue_shared/components/crud_component.vue
+++ b/app/assets/javascripts/vue_shared/components/crud_component.vue
@@ -217,7 +217,7 @@ export default {
         </p>
       </div>
       <div class="gl-flex gl-items-center gl-gap-3" data-testid="crud-actions">
-        <slot name="actions"></slot>
+        <slot name="actions" :show-form="showForm"></slot>
         <gl-button
           v-if="toggleText && !isFormUsedAndVisible"
           size="small"
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index cb64b7653d2..3708c885143 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -1,258 +1,261 @@
 # frozen_string_literal: true
 
-class Admin::ApplicationSettingsController < Admin::ApplicationController
-  include InternalRedirect
-  include IntegrationsHelper
-  include DefaultBranchProtection
+module Admin
+  class ApplicationSettingsController < Admin::ApplicationController
+    include InternalRedirect
+    include IntegrationsHelper
+    include DefaultBranchProtection
 
-  # NOTE: Use @application_setting in this controller when you need to access
-  # application_settings after it has been modified. This is because the
-  # ApplicationSetting model uses Gitlab::ProcessMemoryCache for caching and the
-  # cache might be stale immediately after an update.
-  # https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/30233
-  before_action :set_application_setting, except: :integrations
+    # NOTE: Use @application_setting in this controller when you need to access
+    # application_settings after it has been modified. This is because the
+    # ApplicationSetting model uses Gitlab::ProcessMemoryCache for caching and the
+    # cache might be stale immediately after an update.
+    # https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/30233
+    before_action :set_application_setting, except: :integrations
 
-  before_action :disable_query_limiting, only: [:usage_data]
-  before_action :prerecorded_service_ping_data, only: [:metrics_and_profiling] # rubocop:disable Rails/LexicallyScopedActionFilter
+    before_action :disable_query_limiting, only: [:usage_data]
+    before_action :prerecorded_service_ping_data, only: [:metrics_and_profiling] # rubocop:disable Rails/LexicallyScopedActionFilter
 
-  before_action do
-    push_frontend_feature_flag(:ci_variables_pages, current_user)
-  end
-
-  feature_category :not_owned, [ # rubocop:todo Gitlab/AvoidFeatureCategoryNotOwned
-    :general, :reporting, :metrics_and_profiling, :network,
-    :preferences, :update, :reset_health_check_token
-  ]
-
-  urgency :low, [
-    :reset_error_tracking_access_token
-  ]
-
-  feature_category :source_code_management, [:repository, :clear_repository_check_states]
-  feature_category :continuous_integration, [:ci_cd, :reset_registration_token]
-  urgency :low, [:ci_cd, :reset_registration_token]
-  feature_category :service_ping, [:usage_data]
-  feature_category :integrations, [:integrations, :slack_app_manifest_share, :slack_app_manifest_download]
-  feature_category :pages, [:lets_encrypt_terms_of_service]
-  feature_category :observability, [:reset_error_tracking_access_token]
-
-  VALID_SETTING_PANELS = %w[general repository
-    ci_cd reporting metrics_and_profiling
-    network preferences].freeze
-
-  # The current size of a sidekiq job's jid is 24 characters. The size of the
-  # jid is an internal detail of Sidekiq, and they do not guarantee that it'll
-  # stay the same. We chose 50 to give us room in case the size of the jid
-  # increases. The jid is alphanumeric, so 50 is very generous. There is a spec
-  # that ensures that the constant value is more than the size of an actual jid.
-  PARAM_JOB_ID_MAX_SIZE = 50
-
-  VALID_SETTING_PANELS.each do |action|
-    define_method(action) { perform_update if submitted? }
-  end
-
-  def integrations
-    return not_found unless instance_level_integrations?
-
-    @integrations = Integration.find_or_initialize_all_non_project_specific(
-      Integration.for_instance, include_instance_specific: true
-    ).sort_by { |int| int.title.downcase }
-  end
-
-  def update
-    perform_update
-  end
-
-  def usage_data
-    return not_found unless prerecorded_service_ping_data.present?
-
-    respond_to do |format|
-      format.html do
-        usage_data_json = Gitlab::Json.pretty_generate(prerecorded_service_ping_data)
-
-        render html: Gitlab::Highlight.highlight('payload.json', usage_data_json, language: 'json')
-      end
-
-      format.json do
-        Gitlab::InternalEvents.track_event('usage_data_download_payload_clicked', user: current_user)
-
-        render json: Gitlab::Json.dump(prerecorded_service_ping_data)
-      end
-    end
-  end
-
-  def reset_registration_token
-    ::Ci::Runners::ResetRegistrationTokenService.new(@application_setting, current_user).execute
-
-    flash[:notice] = _('New runners registration token has been generated!')
-    redirect_to admin_runners_path
-  end
-
-  def reset_health_check_token
-    @application_setting.reset_health_check_access_token!
-    flash[:notice] = _('New health check access token has been generated!')
-    redirect_back_or_default
-  end
-
-  def reset_error_tracking_access_token
-    @application_setting.reset_error_tracking_access_token!
-
-    redirect_to general_admin_application_settings_path,
-      notice: _('New error tracking access token has been generated!')
-  end
-
-  def clear_repository_check_states
-    RepositoryCheck::ClearWorker.perform_async # rubocop:disable CodeReuse/Worker
-
-    redirect_to(
-      general_admin_application_settings_path,
-      notice: _('Started asynchronous removal of all repository check states.')
-    )
-  end
-
-  # Getting ToS url requires `directory` api call to Let's Encrypt
-  # which could result in 500 error/slow rendering on settings page
-  # Because of that we use separate controller action
-  def lets_encrypt_terms_of_service
-    redirect_to ::Gitlab::LetsEncrypt.terms_of_service_url
-  end
-
-  def slack_app_manifest_share
-    redirect_to Slack::Manifest.share_url
-  end
-
-  def slack_app_manifest_download
-    send_data Slack::Manifest.to_json, type: :json, disposition: 'attachment', filename: 'slack_manifest.json'
-  end
-
-  private
-
-  def set_application_setting
-    @application_setting = ApplicationSetting.current_without_cache
-    @plans = Plan.all
-  end
-
-  def disable_query_limiting
-    Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/-/issues/29418')
-  end
-
-  def application_setting_params # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
-    params[:application_setting] ||= {}
-
-    if params[:application_setting].key?(:enabled_oauth_sign_in_sources)
-      enabled_oauth_sign_in_sources = params[:application_setting].delete(:enabled_oauth_sign_in_sources)
-      enabled_oauth_sign_in_sources&.delete("")
-
-      params[:application_setting][:disabled_oauth_sign_in_sources] =
-        AuthHelper.button_based_providers.map(&:to_s) -
-        Array(enabled_oauth_sign_in_sources)
+    before_action do
+      push_frontend_feature_flag(:ci_variables_pages, current_user)
     end
 
-    params[:application_setting][:import_sources]&.delete("")
-    params[:application_setting][:valid_runner_registrars]&.delete("")
-    params[:application_setting][:restricted_visibility_levels]&.delete("")
-
-    params[:application_setting][:package_metadata_purl_types]&.delete("")
-    params[:application_setting][:package_metadata_purl_types]&.map!(&:to_i)
-
-    normalize_default_branch_params!(:application_setting)
-
-    if params[:application_setting][:required_instance_ci_template].blank?
-      params[:application_setting][:required_instance_ci_template] = nil
-    end
-
-    remove_blank_params_for!(:elasticsearch_aws_secret_access_key, :eks_secret_access_key)
-
-    # TODO Remove domain_denylist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-foss/issues/67204)
-    params.delete(:domain_denylist_raw) if params[:domain_denylist_file]
-    params.delete(:domain_denylist_raw) if params[:domain_denylist]
-    params.delete(:domain_allowlist_raw) if params[:domain_allowlist]
-
-    params[:application_setting].permit(visible_application_setting_attributes)
-  end
-
-  def recheck_user_consent?
-    return false unless session[:ask_for_usage_stats_consent]
-    return false unless params[:application_setting]
-
-    params[:application_setting].key?(:usage_ping_enabled) || params[:application_setting].key?(:version_check_enabled)
-  end
-
-  def visible_application_setting_attributes
-    [
-      *::ApplicationSettingsHelper.visible_attributes,
-      *::ApplicationSettingsHelper.external_authorization_service_attributes,
-      *ApplicationSetting.kroki_formats_attributes.keys.map { |key| "kroki_formats_#{key}".to_sym },
-      { default_branch_protection_defaults: [
-        :allow_force_push,
-        :developer_can_initial_push,
-        {
-          allowed_to_merge: [:access_level],
-          allowed_to_push: [:access_level]
-        }
-      ] },
-      :lets_encrypt_notification_email,
-      :lets_encrypt_terms_of_service_accepted,
-      :domain_denylist_file,
-      :raw_blob_request_limit,
-      :issues_create_limit,
-      :notes_create_limit,
-      :pipeline_limit_per_project_user_sha,
-      :default_branch_name,
-      :auto_approve_pending_users,
-      { disabled_oauth_sign_in_sources: [],
-        import_sources: [],
-        package_metadata_purl_types: [],
-        restricted_visibility_levels: [],
-        repository_storages_weighted: {},
-        valid_runner_registrars: [] }
+    feature_category :not_owned, [ # rubocop:todo Gitlab/AvoidFeatureCategoryNotOwned
+      :general, :reporting, :metrics_and_profiling, :network,
+      :preferences, :update, :reset_health_check_token
     ]
-  end
 
-  def submitted?
-    request.patch?
-  end
+    urgency :low, [
+      :reset_error_tracking_access_token
+    ]
 
-  def perform_update
-    successful = ::ApplicationSettings::UpdateService
-      .new(@application_setting, current_user, application_setting_params)
-      .execute
+    feature_category :source_code_management, [:repository, :clear_repository_check_states]
+    feature_category :continuous_integration, [:ci_cd, :reset_registration_token]
+    urgency :low, [:ci_cd, :reset_registration_token]
+    feature_category :service_ping, [:usage_data]
+    feature_category :integrations, [:integrations, :slack_app_manifest_share, :slack_app_manifest_download]
+    feature_category :pages, [:lets_encrypt_terms_of_service]
+    feature_category :observability, [:reset_error_tracking_access_token]
 
-    session[:ask_for_usage_stats_consent] = current_user.requires_usage_stats_consent? if recheck_user_consent?
+    VALID_SETTING_PANELS = %w[general repository
+      ci_cd reporting metrics_and_profiling
+      network preferences].freeze
 
-    redirect_path = referer_path(request) || general_admin_application_settings_path
+    # The current size of a sidekiq job's jid is 24 characters. The size of the
+    # jid is an internal detail of Sidekiq, and they do not guarantee that it'll
+    # stay the same. We chose 50 to give us room in case the size of the jid
+    # increases. The jid is alphanumeric, so 50 is very generous. There is a spec
+    # that ensures that the constant value is more than the size of an actual jid.
+    PARAM_JOB_ID_MAX_SIZE = 50
 
-    respond_to do |format|
-      if successful
-        format.json { head :ok }
-        format.html { redirect_to redirect_path, notice: _('Application settings saved successfully') }
-      else
-        format.json { head :bad_request }
-        format.html { render_update_error }
+    VALID_SETTING_PANELS.each do |action|
+      define_method(action) { perform_update if submitted? }
+    end
+
+    def integrations
+      return not_found unless instance_level_integrations?
+
+      @integrations = Integration.find_or_initialize_all_non_project_specific(
+        Integration.for_instance, include_instance_specific: true
+      ).sort_by { |int| int.title.downcase }
+    end
+
+    def update
+      perform_update
+    end
+
+    def usage_data
+      return not_found unless prerecorded_service_ping_data.present?
+
+      respond_to do |format|
+        format.html do
+          usage_data_json = Gitlab::Json.pretty_generate(prerecorded_service_ping_data)
+
+          render html: Gitlab::Highlight.highlight('payload.json', usage_data_json, language: 'json')
+        end
+
+        format.json do
+          Gitlab::InternalEvents.track_event('usage_data_download_payload_clicked', user: current_user)
+
+          render json: Gitlab::Json.dump(prerecorded_service_ping_data)
+        end
       end
     end
-  end
 
-  def render_update_error
-    action = valid_setting_panels.include?(action_name) ? action_name : :general
+    def reset_registration_token
+      ::Ci::Runners::ResetRegistrationTokenService.new(@application_setting, current_user).execute
 
-    flash[:alert] = _('Application settings update failed')
+      flash[:notice] = _('New runners registration token has been generated!')
+      redirect_to admin_runners_path
+    end
 
-    render action
-  end
+    def reset_health_check_token
+      @application_setting.reset_health_check_access_token!
+      flash[:notice] = _('New health check access token has been generated!')
+      redirect_back_or_default
+    end
 
-  def remove_blank_params_for!(*keys)
-    params[:application_setting].delete_if { |setting, value| setting.to_sym.in?(keys) && value.blank? }
-  end
+    def reset_error_tracking_access_token
+      @application_setting.reset_error_tracking_access_token!
 
-  # overridden in EE
-  def valid_setting_panels
-    VALID_SETTING_PANELS
-  end
+      redirect_to general_admin_application_settings_path,
+        notice: _('New error tracking access token has been generated!')
+    end
 
-  def prerecorded_service_ping_data
-    @service_ping_data ||= Rails.cache.fetch(Gitlab::Usage::ServicePingReport::CACHE_KEY) ||
-      ::RawUsageData.for_current_reporting_cycle.first&.payload
+    def clear_repository_check_states
+      RepositoryCheck::ClearWorker.perform_async # rubocop:disable CodeReuse/Worker
+
+      redirect_to(
+        general_admin_application_settings_path,
+        notice: _('Started asynchronous removal of all repository check states.')
+      )
+    end
+
+    # Getting ToS url requires `directory` api call to Let's Encrypt
+    # which could result in 500 error/slow rendering on settings page
+    # Because of that we use separate controller action
+    def lets_encrypt_terms_of_service
+      redirect_to ::Gitlab::LetsEncrypt.terms_of_service_url
+    end
+
+    def slack_app_manifest_share
+      redirect_to Slack::Manifest.share_url
+    end
+
+    def slack_app_manifest_download
+      send_data Slack::Manifest.to_json, type: :json, disposition: 'attachment', filename: 'slack_manifest.json'
+    end
+
+    private
+
+    def set_application_setting
+      @application_setting = ApplicationSetting.current_without_cache
+      @plans = Plan.all
+    end
+
+    def disable_query_limiting
+      Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/-/issues/29418')
+    end
+
+    def application_setting_params # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
+      params[:application_setting] ||= {}
+
+      if params[:application_setting].key?(:enabled_oauth_sign_in_sources)
+        enabled_oauth_sign_in_sources = params[:application_setting].delete(:enabled_oauth_sign_in_sources)
+        enabled_oauth_sign_in_sources&.delete("")
+
+        params[:application_setting][:disabled_oauth_sign_in_sources] =
+          AuthHelper.button_based_providers.map(&:to_s) -
+          Array(enabled_oauth_sign_in_sources)
+      end
+
+      params[:application_setting][:import_sources]&.delete("")
+      params[:application_setting][:valid_runner_registrars]&.delete("")
+      params[:application_setting][:restricted_visibility_levels]&.delete("")
+
+      params[:application_setting][:package_metadata_purl_types]&.delete("")
+      params[:application_setting][:package_metadata_purl_types]&.map!(&:to_i)
+
+      normalize_default_branch_params!(:application_setting)
+
+      if params[:application_setting][:required_instance_ci_template].blank?
+        params[:application_setting][:required_instance_ci_template] = nil
+      end
+
+      remove_blank_params_for!(:elasticsearch_aws_secret_access_key, :eks_secret_access_key)
+
+      # TODO Remove domain_denylist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-foss/issues/67204)
+      params.delete(:domain_denylist_raw) if params[:domain_denylist_file]
+      params.delete(:domain_denylist_raw) if params[:domain_denylist]
+      params.delete(:domain_allowlist_raw) if params[:domain_allowlist]
+
+      params[:application_setting].permit(visible_application_setting_attributes)
+    end
+
+    def recheck_user_consent?
+      return false unless session[:ask_for_usage_stats_consent]
+      return false unless params[:application_setting]
+
+      params[:application_setting].key?(:usage_ping_enabled) ||
+        params[:application_setting].key?(:version_check_enabled)
+    end
+
+    def visible_application_setting_attributes
+      [
+        *::ApplicationSettingsHelper.visible_attributes,
+        *::ApplicationSettingsHelper.external_authorization_service_attributes,
+        *ApplicationSetting.kroki_formats_attributes.keys.map { |key| :"kroki_formats_#{key}" },
+        { default_branch_protection_defaults: [
+          :allow_force_push,
+          :developer_can_initial_push,
+          {
+            allowed_to_merge: [:access_level],
+            allowed_to_push: [:access_level]
+          }
+        ] },
+        :lets_encrypt_notification_email,
+        :lets_encrypt_terms_of_service_accepted,
+        :domain_denylist_file,
+        :raw_blob_request_limit,
+        :issues_create_limit,
+        :notes_create_limit,
+        :pipeline_limit_per_project_user_sha,
+        :default_branch_name,
+        :auto_approve_pending_users,
+        { disabled_oauth_sign_in_sources: [],
+          import_sources: [],
+          package_metadata_purl_types: [],
+          restricted_visibility_levels: [],
+          repository_storages_weighted: {},
+          valid_runner_registrars: [] }
+      ]
+    end
+
+    def submitted?
+      request.patch?
+    end
+
+    def perform_update
+      successful = ::ApplicationSettings::UpdateService
+        .new(@application_setting, current_user, application_setting_params)
+        .execute
+
+      session[:ask_for_usage_stats_consent] = current_user.requires_usage_stats_consent? if recheck_user_consent?
+
+      redirect_path = referer_path(request) || general_admin_application_settings_path
+
+      respond_to do |format|
+        if successful
+          format.json { head :ok }
+          format.html { redirect_to redirect_path, notice: _('Application settings saved successfully') }
+        else
+          format.json { head :bad_request }
+          format.html { render_update_error }
+        end
+      end
+    end
+
+    def render_update_error
+      action = valid_setting_panels.include?(action_name) ? action_name : :general
+
+      flash[:alert] = _('Application settings update failed')
+
+      render action
+    end
+
+    def remove_blank_params_for!(*keys)
+      params[:application_setting].delete_if { |setting, value| setting.to_sym.in?(keys) && value.blank? }
+    end
+
+    # overridden in EE
+    def valid_setting_panels
+      VALID_SETTING_PANELS
+    end
+
+    def prerecorded_service_ping_data
+      @service_ping_data ||= Rails.cache.fetch(Gitlab::Usage::ServicePingReport::CACHE_KEY) ||
+        ::RawUsageData.for_current_reporting_cycle.first&.payload
+    end
   end
 end
 
diff --git a/app/controllers/admin/jobs_controller.rb b/app/controllers/admin/jobs_controller.rb
index d0ade3e6024..125c09bda07 100644
--- a/app/controllers/admin/jobs_controller.rb
+++ b/app/controllers/admin/jobs_controller.rb
@@ -18,3 +18,5 @@ class Admin::JobsController < Admin::ApplicationController
     redirect_to admin_jobs_path, status: :see_other
   end
 end
+
+Admin::JobsController.prepend_mod
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
index 10d57e441a1..08e38811841 100644
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -4,6 +4,9 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
   include Gitlab::GonHelper
   include InitializesCurrentUserMode
   include Gitlab::Utils::StrongMemoize
+  include RequestPayloadLogger
+
+  alias_method :auth_user, :current_user
 
   prepend_before_action :set_current_organization
 
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb
index 5d093c7fa01..21deac8b74c 100644
--- a/app/controllers/projects/settings/ci_cd_controller.rb
+++ b/app/controllers/projects/settings/ci_cd_controller.rb
@@ -18,6 +18,7 @@ module Projects
         push_frontend_feature_flag(:ci_variables_pages, current_user)
         push_frontend_feature_flag(:allow_push_repository_for_job_token, @project)
         push_frontend_feature_flag(:add_policies_to_ci_job_token, @project)
+        push_frontend_feature_flag(:authentication_logs_migration_for_allowlist, @project)
 
         push_frontend_ability(ability: :admin_project, resource: @project, user: current_user)
       end
diff --git a/app/events/merge_requests/approved_event.rb b/app/events/merge_requests/approved_event.rb
index c68a002dcc3..c5f1c7119e4 100644
--- a/app/events/merge_requests/approved_event.rb
+++ b/app/events/merge_requests/approved_event.rb
@@ -11,7 +11,8 @@ module MergeRequests
         ],
         'properties' => {
           'current_user_id' => { 'type' => 'integer' },
-          'merge_request_id' => { 'type' => 'integer' }
+          'merge_request_id' => { 'type' => 'integer' },
+          'approved_at' => { 'type' => 'string', 'format' => 'date-time' }
         }
       }
     end
diff --git a/app/finders/ci/jobs_finder.rb b/app/finders/ci/jobs_finder.rb
index d846448fefc..612437a8e20 100644
--- a/app/finders/ci/jobs_finder.rb
+++ b/app/finders/ci/jobs_finder.rb
@@ -33,7 +33,7 @@ module Ci
     end
 
     def all_jobs
-      raise Gitlab::Access::AccessDeniedError unless current_user&.can_admin_all_resources?
+      raise Gitlab::Access::AccessDeniedError unless can?(current_user, :read_admin_cicd)
 
       type.all
     end
diff --git a/app/helpers/admin/jobs_helper.rb b/app/helpers/admin/jobs_helper.rb
new file mode 100644
index 00000000000..342aa48335a
--- /dev/null
+++ b/app/helpers/admin/jobs_helper.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Admin
+  module JobsHelper
+    def admin_jobs_app_data
+      {
+        job_statuses: job_statuses.to_json,
+        empty_state_svg_path: image_path('illustrations/empty-state/empty-pipeline-md.svg'),
+        url: cancel_all_admin_jobs_path,
+        can_update_all_jobs: current_user.can_admin_all_resources?.to_s
+      }
+    end
+  end
+end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 044072c1139..de3ea181bec 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -730,14 +730,11 @@ module ProjectsHelper
   end
 
   def delete_immediately_message(project)
-    message = _('This action deletes %{codeOpen}%{project_path_with_namespace}%{codeClose} and everything this ' \
-      'project contains. %{strongOpen}There is no going back.%{strongClose}')
-
-    ERB::Util.html_escape(message) % delete_message_data(project)
+    _('This action will permanently delete this project, including all its resources.')
   end
 
-  def project_delete_immediately_button_data(project)
-    project_delete_button_shared_data(project).merge({
+  def project_delete_immediately_button_data(project, button_text = nil)
+    project_delete_button_shared_data(project, button_text).merge({
       form_path: project_path(project, permanently_delete: true)
     })
   end
@@ -767,7 +764,7 @@ module ProjectsHelper
     }
   end
 
-  def project_delete_button_shared_data(project)
+  def project_delete_button_shared_data(project, button_text = nil)
     merge_requests_count = Projects::AllMergeRequestsCountService.new(project).count
     issues_count = Projects::AllIssuesCountService.new(project).count
     forks_count = Projects::ForksCountService.new(project).count
@@ -778,7 +775,8 @@ module ProjectsHelper
       issues_count: number_with_delimiter(issues_count),
       merge_requests_count: number_with_delimiter(merge_requests_count),
       forks_count: number_with_delimiter(forks_count),
-      stars_count: number_with_delimiter(project.star_count)
+      stars_count: number_with_delimiter(project.star_count),
+      button_text: button_text.presence || _('Delete project')
     }
   end
 
diff --git a/app/models/merge_request/approval_metrics.rb b/app/models/merge_request/approval_metrics.rb
new file mode 100644
index 00000000000..c8f39554961
--- /dev/null
+++ b/app/models/merge_request/approval_metrics.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class MergeRequest::ApprovalMetrics < ApplicationRecord # rubocop:disable Style/ClassAndModuleChildren, Gitlab/BoundedContexts -- Same as the rest of the models
+  belongs_to :merge_request, optional: false
+  belongs_to :target_project, class_name: 'Project', inverse_of: :merge_requests, optional: false
+
+  validates :last_approved_at, presence: true
+
+  def self.refresh_last_approved_at(merge_request:, last_approved_at:)
+    attributes = {
+      merge_request_id: merge_request.id,
+      target_project_id: merge_request.target_project_id,
+      last_approved_at: last_approved_at
+    }
+
+    upsert(
+      attributes,
+      unique_by: :merge_request_id,
+      on_duplicate: Arel.sql(<<~SQL.squish)
+        last_approved_at = GREATEST(excluded.last_approved_at, merge_request_approval_metrics.last_approved_at)
+      SQL
+    )
+  end
+end
diff --git a/app/policies/global_policy.rb b/app/policies/global_policy.rb
index 7836716d103..c2b70d68be0 100644
--- a/app/policies/global_policy.rb
+++ b/app/policies/global_policy.rb
@@ -149,6 +149,9 @@ class GlobalPolicy < BasePolicy
     enable :create_instance_runner
     enable :read_web_hook
     enable :admin_web_hook
+
+    # Admin pages
+    enable :read_admin_cicd
   end
 
   # We can't use `read_statistics` because the user may have different permissions for different projects
diff --git a/app/services/ci/collect_aggregate_pipeline_analytics_service.rb b/app/services/ci/collect_aggregate_pipeline_analytics_service.rb
index 6fef44889db..03a01c83160 100644
--- a/app/services/ci/collect_aggregate_pipeline_analytics_service.rb
+++ b/app/services/ci/collect_aggregate_pipeline_analytics_service.rb
@@ -47,7 +47,7 @@ module Ci
       duration_query = query.select(*allowed_duration_percentiles.map { |p| query.duration_quantile_function(p) })
       duration_result = ::ClickHouse::Client.select(duration_query.to_sql, :main)
       result[:duration_statistics] = duration_result.first.symbolize_keys.transform_values do |interval|
-        interval ? interval.to_f.round(3).seconds : nil
+        interval ? interval.to_f.round(3).seconds : 0.0
       end
     end
 
diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb
index 4bdca026ee8..a359e088276 100644
--- a/app/services/ci/register_job_service.rb
+++ b/app/services/ci/register_job_service.rb
@@ -176,11 +176,9 @@ module Ci
         return
       end
 
-      @logger.instrument(:process_build_link_identity) do
-        # Make sure that composite identity is propagated to `PipelineProcessWorker`
-        # when the build's status change.
-        ::Gitlab::Auth::Identity.link_from_job(build)
-      end
+      # Make sure that composite identity is propagated to `PipelineProcessWorker`
+      # when the build's status change.
+      ::Gitlab::Auth::Identity.link_from_job(build)
 
       # In case when 2 runners try to assign the same build, second runner will be declined
       # with StateMachines::InvalidTransition or StaleObjectError when doing run! or save method.
@@ -223,16 +221,12 @@ module Ci
     def remove_from_queue!(build)
       @metrics.increment_queue_operation(:build_not_pending)
 
-      @logger.instrument(:process_build_not_pending) do
-        ##
-        # If this build can not be picked because we had stale data in
-        # `ci_pending_builds` table, we need to respond with 409 to retry
-        # this operation.
-        #
-        if ::Ci::UpdateBuildQueueService.new.remove!(build)
-          Result.new(nil, nil, nil, false)
-        end
-      end
+      ##
+      # If this build can not be picked because we had stale data in
+      # `ci_pending_builds` table, we need to respond with 409 to retry
+      # this operation.
+      #
+      Result.new(nil, nil, nil, false) if ::Ci::UpdateBuildQueueService.new.remove!(build)
     end
 
     def runner_matched?(build)
@@ -251,12 +245,18 @@ module Ci
     def present_build!(build)
       # We need to use the presenter here because Gitaly calls in the presenter
       # may fail, and we need to ensure the response has been generated.
-      presented_build = ::Ci::BuildRunnerPresenter.new(build) # rubocop:disable CodeReuse/Presenter
+      presented_build = @logger.instrument(:present_build_presenter) do
+        ::Ci::BuildRunnerPresenter.new(build) # rubocop:disable CodeReuse/Presenter -- old code
+      end
 
-      log_artifacts_context(build)
-      log_build_dependencies_size(presented_build)
+      @logger.instrument(:present_build_logs) do
+        log_artifacts_context(build)
+        log_build_dependencies_size(presented_build)
+      end
 
-      build_json = Gitlab::Json.dump(::API::Entities::Ci::JobRequest::Response.new(presented_build))
+      build_json = @logger.instrument(:present_build_response_json) do
+        Gitlab::Json.dump(::API::Entities::Ci::JobRequest::Response.new(presented_build))
+      end
       Result.new(build, build_json, presented_build, true)
     end
 
@@ -282,16 +282,22 @@ module Ci
       build.runner_id = runner.id
       build.runner_session_attributes = params[:session] if params[:session].present?
 
-      failure_reason, _ = pre_assign_runner_checks.find { |_, check| check.call(build, params) }
+      failure_reason, _ = @logger.instrument(:assign_runner_failure_reason) do
+        pre_assign_runner_checks.find { |_, check| check.call(build, params) }
+      end
 
       if failure_reason
         @metrics.increment_queue_operation(:runner_pre_assign_checks_failed)
 
-        build.drop!(failure_reason)
+        @logger.instrument(:assign_runner_drop) do
+          build.drop!(failure_reason)
+        end
       else
         @metrics.increment_queue_operation(:runner_pre_assign_checks_success)
 
-        build.run!
+        @logger.instrument(:assign_runner_run) do
+          build.run!
+        end
         persist_runtime_features(build, params)
 
         build.runner_manager = runner_manager if runner_manager
diff --git a/app/services/merge_requests/approval_service.rb b/app/services/merge_requests/approval_service.rb
index 2770bb95c70..e289524ed81 100644
--- a/app/services/merge_requests/approval_service.rb
+++ b/app/services/merge_requests/approval_service.rb
@@ -29,7 +29,8 @@ module MergeRequests
       # Workers can subscribe to the `MergeRequests::ApprovedEvent`.
       Gitlab::EventStore.publish(
         MergeRequests::ApprovedEvent.new(
-          data: { current_user_id: current_user.id, merge_request_id: merge_request.id }
+          data: { current_user_id: current_user.id, merge_request_id: merge_request.id,
+                  approved_at: approval.created_at.iso8601 }
         )
       )
 
diff --git a/app/views/admin/jobs/index.html.haml b/app/views/admin/jobs/index.html.haml
index 9af5ffd7936..11b7dd79aed 100644
--- a/app/views/admin/jobs/index.html.haml
+++ b/app/views/admin/jobs/index.html.haml
@@ -4,4 +4,4 @@
 - page_title _("Jobs")
 
 
-#admin-jobs-app{ data: { job_statuses: job_statuses.to_json, empty_state_svg_path: image_path('illustrations/empty-state/empty-pipeline-md.svg'), url: cancel_all_admin_jobs_path } }
+#admin-jobs-app{ data: admin_jobs_app_data }
diff --git a/app/views/groups/settings/_permanent_deletion.html.haml b/app/views/groups/settings/_permanent_deletion.html.haml
index 1e5366e6090..cea7583360d 100644
--- a/app/views/groups/settings/_permanent_deletion.html.haml
+++ b/app/views/groups/settings/_permanent_deletion.html.haml
@@ -8,8 +8,6 @@
   - c.with_body do
     = form_tag(group, method: :delete, id: remove_form_id) do
       %p
-        = _('Deleting this group also deletes all child projects, including archived projects, and their resources.')
-        %br
-        %strong= _('Deleted group can not be restored!')
+        = _('This action will permanently delete this group, including its subgroups and projects.')
 
       = render 'groups/settings/remove_button', group: group, remove_form_id: remove_form_id
diff --git a/app/views/groups/settings/_remove_button.html.haml b/app/views/groups/settings/_remove_button.html.haml
index 251a9e68f2c..c992f84623e 100644
--- a/app/views/groups/settings/_remove_button.html.haml
+++ b/app/views/groups/settings/_remove_button.html.haml
@@ -1,8 +1,9 @@
 - remove_form_id = local_assigns.fetch(:remove_form_id, nil)
+- button_text = local_assigns.fetch(:button_text, nil)
 
 - if group.linked_to_subscription?
   = render Pajamas::AlertComponent.new(variant: :tip, dismissible: false, alert_options: { class: 'gl-mb-5', data: { testid: 'group-has-linked-subscription-alert' }}) do |c|
     - c.with_body do
       = html_escape(_("This group can't be removed because it is linked to a subscription. To remove this group, %{linkStart}link the subscription%{linkEnd} with a different group.")) % { linkStart: "<a href=\"#{help_page_path('subscriptions/gitlab_com/index.md', anchor: 'link-subscription-to-a-group')}\">".html_safe, linkEnd: '</a>'.html_safe }
 
-.js-confirm-danger{ data: group_confirm_modal_data(group: group, remove_form_id: remove_form_id) }
+.js-confirm-danger{ data: group_confirm_modal_data(group: group, remove_form_id: remove_form_id, button_text: button_text) }
diff --git a/app/views/projects/_delete.html.haml b/app/views/projects/_delete.html.haml
index 8d9f995e4a9..dc73e562b25 100644
--- a/app/views/projects/_delete.html.haml
+++ b/app/views/projects/_delete.html.haml
@@ -1,9 +1,10 @@
 - return unless can?(current_user, :remove_project, @project)
+- title = @project.marked_for_deletion_at.present? ? _('Delete project immediately') : _('Delete project')
 
-= render Pajamas::CardComponent.new(header_options: { class: 'gl-px-5 gl-py-4 gl-border-b-1 gl-border-b-solid gl-border-default' }, body_options: { class: 'gl-bg-red-50 gl-px-5 gl-py-4' }) do |c|
+= render Pajamas::CardComponent.new(body_options: { class: 'gl-bg-red-50' }) do |c|
   - c.with_header do
     .gl-flex.gl-grow
-      %h4.gl-text-base.gl-leading-24.gl-m-0.danger-title= _('Delete this project')
+      %h4.gl-text-base.gl-leading-24.gl-m-0.gl-text-red-500= title
 
   - c.with_body do
     = render 'projects/delete_card_body'
diff --git a/app/views/projects/_delete_immediately.html.haml b/app/views/projects/_delete_immediately.html.haml
index b4d0f4a4736..cd1f4b534a2 100644
--- a/app/views/projects/_delete_immediately.html.haml
+++ b/app/views/projects/_delete_immediately.html.haml
@@ -1,3 +1,5 @@
+- button_text = local_assigns.fetch(:button_text, nil)
+
 %p
   = delete_immediately_message(@project)
-#js-project-delete-button{ data: project_delete_immediately_button_data(@project) }
+#js-project-delete-button{ data: project_delete_immediately_button_data(@project, button_text) }
diff --git a/config/feature_flags/gitlab_com_derisk/authentication_logs_migration_for_allowlist.yml b/config/feature_flags/gitlab_com_derisk/authentication_logs_migration_for_allowlist.yml
new file mode 100644
index 00000000000..cb3dc67f1bb
--- /dev/null
+++ b/config/feature_flags/gitlab_com_derisk/authentication_logs_migration_for_allowlist.yml
@@ -0,0 +1,9 @@
+---
+name: authentication_logs_migration_for_allowlist
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/498125
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/178429
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/514159
+milestone: '17.9'
+group: group::pipeline security
+type: gitlab_com_derisk
+default_enabled: false
diff --git a/config/feature_flags/ops/automatic_lock_writes_on_partition_tables.yml b/config/feature_flags/ops/automatic_lock_writes_on_partition_tables.yml
index dcaa0c9b4cb..cc5f0768fe1 100644
--- a/config/feature_flags/ops/automatic_lock_writes_on_partition_tables.yml
+++ b/config/feature_flags/ops/automatic_lock_writes_on_partition_tables.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132517
 rollout_issue_url:
 milestone: '16.5'
 type: ops
-group: group::tenant scale
+group: group::cells infrastructure
 default_enabled: true
diff --git a/config/feature_flags/ops/automatic_lock_writes_on_table.yml b/config/feature_flags/ops/automatic_lock_writes_on_table.yml
index 116814a1738..d76fc026d8c 100644
--- a/config/feature_flags/ops/automatic_lock_writes_on_table.yml
+++ b/config/feature_flags/ops/automatic_lock_writes_on_table.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99287
 rollout_issue_url:
 milestone: '15.7'
 type: ops
-group: group::tenant scale
+group: group::cells infrastructure
 default_enabled: true
diff --git a/config/feature_flags/ops/detect_cross_database_modification.yml b/config/feature_flags/ops/detect_cross_database_modification.yml
index 6c94e81ba82..b7a3e8f9abf 100644
--- a/config/feature_flags/ops/detect_cross_database_modification.yml
+++ b/config/feature_flags/ops/detect_cross_database_modification.yml
@@ -3,5 +3,5 @@ name: detect_cross_database_modification
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73316
 milestone: '14.5'
 type: ops
-group: group::tenant scale
+group: group::cells infrastructure
 default_enabled: false
diff --git a/config/feature_flags/ops/lock_tables_in_monitoring.yml b/config/feature_flags/ops/lock_tables_in_monitoring.yml
index 5f6ffdff77b..20f4220ca12 100644
--- a/config/feature_flags/ops/lock_tables_in_monitoring.yml
+++ b/config/feature_flags/ops/lock_tables_in_monitoring.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129748
 rollout_issue_url:
 milestone: '16.4'
 type: ops
-group: group::tenant scale
+group: group::cells infrastructure
 default_enabled: true
diff --git a/config/feature_flags/ops/loose_foreign_keys_turbo_mode_ci.yml b/config/feature_flags/ops/loose_foreign_keys_turbo_mode_ci.yml
index 6858e90e1a5..c443dd7cbc9 100644
--- a/config/feature_flags/ops/loose_foreign_keys_turbo_mode_ci.yml
+++ b/config/feature_flags/ops/loose_foreign_keys_turbo_mode_ci.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128538
 rollout_issue_url:
 milestone: '16.4'
 type: ops
-group: group::tenant scale
+group: group::cells infrastructure
 default_enabled: false
diff --git a/config/feature_flags/ops/loose_foreign_keys_turbo_mode_main.yml b/config/feature_flags/ops/loose_foreign_keys_turbo_mode_main.yml
index d6ca513e262..57115ddcf3a 100644
--- a/config/feature_flags/ops/loose_foreign_keys_turbo_mode_main.yml
+++ b/config/feature_flags/ops/loose_foreign_keys_turbo_mode_main.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128538
 rollout_issue_url:
 milestone: '16.4'
 type: ops
-group: group::tenant scale
+group: group::cells infrastructure
 default_enabled: false
diff --git a/config/feature_flags/ops/monitor_database_locked_tables.yml b/config/feature_flags/ops/monitor_database_locked_tables.yml
index 5d8a081aa21..84af519a1d3 100644
--- a/config/feature_flags/ops/monitor_database_locked_tables.yml
+++ b/config/feature_flags/ops/monitor_database_locked_tables.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120926
 rollout_issue_url:
 milestone: '16.1'
 type: ops
-group: group::tenant scale
+group: group::cells infrastructure
 default_enabled: true
diff --git a/config/feature_flags/ops/query_analyzer_gitlab_schema_metrics.yml b/config/feature_flags/ops/query_analyzer_gitlab_schema_metrics.yml
index 3fe041105dd..83476bcc65e 100644
--- a/config/feature_flags/ops/query_analyzer_gitlab_schema_metrics.yml
+++ b/config/feature_flags/ops/query_analyzer_gitlab_schema_metrics.yml
@@ -3,5 +3,5 @@ name: query_analyzer_gitlab_schema_metrics
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73839
 milestone: '14.5'
 type: ops
-group: group::tenant scale
+group: group::cells infrastructure
 default_enabled: false
diff --git a/config/feature_flags/ops/reset_column_information_on_statement_invalid.yml b/config/feature_flags/ops/reset_column_information_on_statement_invalid.yml
index a2bbfaefafd..384a18caeaf 100644
--- a/config/feature_flags/ops/reset_column_information_on_statement_invalid.yml
+++ b/config/feature_flags/ops/reset_column_information_on_statement_invalid.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121957
 rollout_issue_url:
 milestone: '16.1'
 type: ops
-group: group::tenant scale
+group: group::cells infrastructure
 default_enabled: true
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 26e57694088..ab573d4c3ee 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
@@ -10,9 +10,6 @@ time_frame: 28d
 data_source: redis_hll
 data_category: optional
 instrumentation_class: RedisHLLMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml b/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml
index 85719de033b..b674fe779bb 100644
--- a/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml
@@ -14,9 +14,6 @@ data_category: operational
 instrumentation_class: CountCiInternalPipelinesMetric
 performance_indicator_type:
 - customer_health_score
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_with_failures.yml b/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_with_failures.yml
index a36b0b59d51..5c4136eff0e 100644
--- a/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_with_failures.yml
+++ b/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_with_failures.yml
@@ -15,9 +15,6 @@ options:
   status: 2
   has_failures: true
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_without_failures.yml b/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_without_failures.yml
index 1ec970d81b1..fce4fd645f0 100644
--- a/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_without_failures.yml
+++ b/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_without_failures.yml
@@ -15,9 +15,6 @@ options:
   status: 2
   has_failures: false
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_with_failures.yml b/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_with_failures.yml
index 57b642abd40..dd2127a5cf9 100644
--- a/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_with_failures.yml
+++ b/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_with_failures.yml
@@ -15,9 +15,6 @@ options:
   status: 2
   has_failures: true
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_without_failures.yml b/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_without_failures.yml
index 4b41d6ccd00..0f8caed4d40 100644
--- a/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_without_failures.yml
+++ b/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_without_failures.yml
@@ -15,9 +15,6 @@ options:
   status: 2
   has_failures: false
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230306134018_github_import_project_cancelled_monthly.yml b/config/metrics/counts_28d/20230306134018_github_import_project_cancelled_monthly.yml
index 751cd47e81a..3a7f108b47a 100644
--- a/config/metrics/counts_28d/20230306134018_github_import_project_cancelled_monthly.yml
+++ b/config/metrics/counts_28d/20230306134018_github_import_project_cancelled_monthly.yml
@@ -16,9 +16,6 @@ options:
   events:
     - github_import_project_cancelled
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230306134609_github_import_project_partially_completed_monthly.yml b/config/metrics/counts_28d/20230306134609_github_import_project_partially_completed_monthly.yml
index 69445e1b577..3e6e90f5ace 100644
--- a/config/metrics/counts_28d/20230306134609_github_import_project_partially_completed_monthly.yml
+++ b/config/metrics/counts_28d/20230306134609_github_import_project_partially_completed_monthly.yml
@@ -16,9 +16,6 @@ options:
   events:
     - github_import_project_partially_completed
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230417064258_i_container_registry_writes_user_monthly.yml b/config/metrics/counts_28d/20230417064258_i_container_registry_writes_user_monthly.yml
index 45ed3a92a61..6f22b70954f 100644
--- a/config/metrics/counts_28d/20230417064258_i_container_registry_writes_user_monthly.yml
+++ b/config/metrics/counts_28d/20230417064258_i_container_registry_writes_user_monthly.yml
@@ -23,9 +23,6 @@ events:
   unique: user.id
 performance_indicator_type:
 - gmau
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230420160442_i_quickactions_type_monthly.yml b/config/metrics/counts_28d/20230420160442_i_quickactions_type_monthly.yml
index ce2e21bba00..05eb133400b 100644
--- a/config/metrics/counts_28d/20230420160442_i_quickactions_type_monthly.yml
+++ b/config/metrics/counts_28d/20230420160442_i_quickactions_type_monthly.yml
@@ -14,9 +14,6 @@ options:
   events:
     - i_quickactions_type
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230502171807_ci_interpolation_users.yml b/config/metrics/counts_28d/20230502171807_ci_interpolation_users.yml
index 3ff4df7c7fb..73e67570580 100644
--- a/config/metrics/counts_28d/20230502171807_ci_interpolation_users.yml
+++ b/config/metrics/counts_28d/20230502171807_ci_interpolation_users.yml
@@ -11,9 +11,6 @@ data_source: redis_hll
 data_category: optional
 instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
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 5738659f14d..0732fd824b9 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
@@ -10,9 +10,6 @@ time_frame: 28d
 data_source: redis_hll
 data_category: optional
 instrumentation_class: RedisHLLMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230527152402_p_ci_templates_pages_zola_monthly.yml b/config/metrics/counts_28d/20230527152402_p_ci_templates_pages_zola_monthly.yml
index 59dad804d87..329d5bc2a9f 100644
--- a/config/metrics/counts_28d/20230527152402_p_ci_templates_pages_zola_monthly.yml
+++ b/config/metrics/counts_28d/20230527152402_p_ci_templates_pages_zola_monthly.yml
@@ -10,9 +10,6 @@ time_frame: 28d
 data_source: redis_hll
 data_category: optional
 instrumentation_class: RedisHLLMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230531170613_ci_builds.yml b/config/metrics/counts_28d/20230531170613_ci_builds.yml
index f9add1ed7c9..c87b03c7050 100644
--- a/config/metrics/counts_28d/20230531170613_ci_builds.yml
+++ b/config/metrics/counts_28d/20230531170613_ci_builds.yml
@@ -12,9 +12,6 @@ data_category: operational
 instrumentation_class: CountAllCiBuildsMetric
 performance_indicator_type:
 - customer_health_score
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230607203257_i_user_jetbrains_bundled_api_request_monthly.yml b/config/metrics/counts_28d/20230607203257_i_user_jetbrains_bundled_api_request_monthly.yml
index b3f6aaf1591..596598963a2 100644
--- a/config/metrics/counts_28d/20230607203257_i_user_jetbrains_bundled_api_request_monthly.yml
+++ b/config/metrics/counts_28d/20230607203257_i_user_jetbrains_bundled_api_request_monthly.yml
@@ -14,9 +14,6 @@ options:
   events:
   - i_editor_extensions_user_jetbrains_bundled_api_request
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230613085814_i_quickactions_unlink_monthly.yml b/config/metrics/counts_28d/20230613085814_i_quickactions_unlink_monthly.yml
index d87a36e4d54..a51bec3eaef 100644
--- a/config/metrics/counts_28d/20230613085814_i_quickactions_unlink_monthly.yml
+++ b/config/metrics/counts_28d/20230613085814_i_quickactions_unlink_monthly.yml
@@ -13,9 +13,6 @@ instrumentation_class: RedisHLLMetric
 options:
   events:
     - i_quickactions_unlink
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_ci_access_monthly.yml b/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_ci_access_monthly.yml
index 1c85e39a476..bfcb7059c0f 100644
--- a/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_ci_access_monthly.yml
+++ b/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_ci_access_monthly.yml
@@ -15,9 +15,6 @@ options:
     - k8s_api_proxy_requests_unique_agents_via_ci_access
 performance_indicator_type:
 - smau
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_user_access_monthly.yml b/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_user_access_monthly.yml
index 1db4d52f232..684df2155fb 100644
--- a/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_user_access_monthly.yml
+++ b/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_user_access_monthly.yml
@@ -14,9 +14,6 @@ options:
   events:
     - k8s_api_proxy_requests_unique_agents_via_user_access
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_ci_access_monthly.yml b/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_ci_access_monthly.yml
index fac71727542..f15103387a9 100644
--- a/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_ci_access_monthly.yml
+++ b/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_ci_access_monthly.yml
@@ -13,9 +13,6 @@ events:
   - name: k8s_api_proxy_requests_unique_users_via_ci_access
     unique: user.id
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_monthly.yml b/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_monthly.yml
index ea3e2901b4a..9a16f8b2bbd 100644
--- a/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_monthly.yml
+++ b/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_monthly.yml
@@ -13,9 +13,6 @@ events:
   - name: k8s_api_proxy_requests_unique_users_via_user_access
     unique: user.id
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230630153556_flux_git_push_notified_unique_projects_monthly.yml b/config/metrics/counts_28d/20230630153556_flux_git_push_notified_unique_projects_monthly.yml
index ae4149a0d0e..c5058695240 100644
--- a/config/metrics/counts_28d/20230630153556_flux_git_push_notified_unique_projects_monthly.yml
+++ b/config/metrics/counts_28d/20230630153556_flux_git_push_notified_unique_projects_monthly.yml
@@ -14,9 +14,6 @@ options:
   events:
     - flux_git_push_notified_unique_projects
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230724140653_i_code_review_saved_replies_create_monthly.yml b/config/metrics/counts_28d/20230724140653_i_code_review_saved_replies_create_monthly.yml
index 0c2bdbc1ba2..090ea365769 100644
--- a/config/metrics/counts_28d/20230724140653_i_code_review_saved_replies_create_monthly.yml
+++ b/config/metrics/counts_28d/20230724140653_i_code_review_saved_replies_create_monthly.yml
@@ -10,9 +10,6 @@ time_frame: 28d
 data_source: internal_events
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230725194658_i_code_review_saved_replies_use_monthly.yml b/config/metrics/counts_28d/20230725194658_i_code_review_saved_replies_use_monthly.yml
index a49bcc6f553..d2ee52e5986 100644
--- a/config/metrics/counts_28d/20230725194658_i_code_review_saved_replies_use_monthly.yml
+++ b/config/metrics/counts_28d/20230725194658_i_code_review_saved_replies_use_monthly.yml
@@ -10,9 +10,6 @@ time_frame: 28d
 data_source: internal_events
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230809194743_i_code_review_saved_replies_use_in_mr_monthly.yml b/config/metrics/counts_28d/20230809194743_i_code_review_saved_replies_use_in_mr_monthly.yml
index 3b9607403d7..036685fe64c 100644
--- a/config/metrics/counts_28d/20230809194743_i_code_review_saved_replies_use_in_mr_monthly.yml
+++ b/config/metrics/counts_28d/20230809194743_i_code_review_saved_replies_use_in_mr_monthly.yml
@@ -10,9 +10,6 @@ time_frame: 28d
 data_source: internal_events
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230810124157_count_cicd_component_usage_monthly.yml b/config/metrics/counts_28d/20230810124157_count_cicd_component_usage_monthly.yml
index fc71a1063f0..f4cd6c641cf 100644
--- a/config/metrics/counts_28d/20230810124157_count_cicd_component_usage_monthly.yml
+++ b/config/metrics/counts_28d/20230810124157_count_cicd_component_usage_monthly.yml
@@ -11,8 +11,6 @@ data_source: redis_hll
 data_category: optional
 instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
-distribution:
-- ce
 tiers:
 - premium
 - ultimate
diff --git a/config/metrics/counts_28d/20230815171559_i_code_review_saved_replies_use_in_other_monthly.yml b/config/metrics/counts_28d/20230815171559_i_code_review_saved_replies_use_in_other_monthly.yml
index 09100edf368..31dd91d6035 100644
--- a/config/metrics/counts_28d/20230815171559_i_code_review_saved_replies_use_in_other_monthly.yml
+++ b/config/metrics/counts_28d/20230815171559_i_code_review_saved_replies_use_in_other_monthly.yml
@@ -10,9 +10,6 @@ time_frame: 28d
 data_source: internal_events
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230816085153_k8s_api_proxy_requests_unique_agents_via_pat_access_monthly.yml b/config/metrics/counts_28d/20230816085153_k8s_api_proxy_requests_unique_agents_via_pat_access_monthly.yml
index b4f7dff03c1..3a74a093225 100644
--- a/config/metrics/counts_28d/20230816085153_k8s_api_proxy_requests_unique_agents_via_pat_access_monthly.yml
+++ b/config/metrics/counts_28d/20230816085153_k8s_api_proxy_requests_unique_agents_via_pat_access_monthly.yml
@@ -14,9 +14,6 @@ options:
   events:
     - k8s_api_proxy_requests_unique_agents_via_pat_access
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_monthly.yml b/config/metrics/counts_28d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_monthly.yml
index 84bc996f96d..cccdd50e720 100644
--- a/config/metrics/counts_28d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_monthly.yml
+++ b/config/metrics/counts_28d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_monthly.yml
@@ -13,9 +13,6 @@ events:
   - name: k8s_api_proxy_requests_unique_users_via_pat_access
     unique: user.id
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230830153031_p_ci_templates_cosign_monthly.yml b/config/metrics/counts_28d/20230830153031_p_ci_templates_cosign_monthly.yml
index 7d3a1c9c08a..30474aea4b9 100644
--- a/config/metrics/counts_28d/20230830153031_p_ci_templates_cosign_monthly.yml
+++ b/config/metrics/counts_28d/20230830153031_p_ci_templates_cosign_monthly.yml
@@ -11,9 +11,6 @@ data_source: redis_hll
 data_category: optional
 instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230922165305_i_quickactions_set_parent_monthly.yml b/config/metrics/counts_28d/20230922165305_i_quickactions_set_parent_monthly.yml
index 9c656d8b472..a6a34c6fda4 100644
--- a/config/metrics/counts_28d/20230922165305_i_quickactions_set_parent_monthly.yml
+++ b/config/metrics/counts_28d/20230922165305_i_quickactions_set_parent_monthly.yml
@@ -15,9 +15,6 @@ options:
   events:
     - i_quickactions_set_parent
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20230927152527_i_quickactions_add_child_monthly.yml b/config/metrics/counts_28d/20230927152527_i_quickactions_add_child_monthly.yml
index f67e31c9a3e..ec4f5f8eb44 100644
--- a/config/metrics/counts_28d/20230927152527_i_quickactions_add_child_monthly.yml
+++ b/config/metrics/counts_28d/20230927152527_i_quickactions_add_child_monthly.yml
@@ -15,9 +15,6 @@ options:
   events:
     - i_quickactions_add_child
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20231116002424_p_ci_templates_diffblue_cover_monthly.yml b/config/metrics/counts_28d/20231116002424_p_ci_templates_diffblue_cover_monthly.yml
index 01e80cd9ddf..ba8fb79d203 100644
--- a/config/metrics/counts_28d/20231116002424_p_ci_templates_diffblue_cover_monthly.yml
+++ b/config/metrics/counts_28d/20231116002424_p_ci_templates_diffblue_cover_monthly.yml
@@ -10,9 +10,6 @@ time_frame: 28d
 data_source: redis_hll
 data_category: optional
 instrumentation_class: RedisHLLMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20231219135715_users_updating_work_item_todo_monthly.yml b/config/metrics/counts_28d/20231219135715_users_updating_work_item_todo_monthly.yml
index f4f0be3577b..8ba7a471292 100644
--- a/config/metrics/counts_28d/20231219135715_users_updating_work_item_todo_monthly.yml
+++ b/config/metrics/counts_28d/20231219135715_users_updating_work_item_todo_monthly.yml
@@ -13,9 +13,6 @@ instrumentation_class: RedisHLLMetric
 options:
   events:
     - users_updating_work_item_todo
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20231227173838_i_container_registry_push_tag_deploy_token_monthly.yml b/config/metrics/counts_28d/20231227173838_i_container_registry_push_tag_deploy_token_monthly.yml
index 59878ce5bd2..56288c4c2ab 100644
--- a/config/metrics/counts_28d/20231227173838_i_container_registry_push_tag_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20231227173838_i_container_registry_push_tag_deploy_token_monthly.yml
@@ -14,9 +14,6 @@ options:
   events:
   - i_container_registry_push_tag_deploy_token
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20231227174251_i_container_registry_delete_tag_deploy_token_monthly.yml b/config/metrics/counts_28d/20231227174251_i_container_registry_delete_tag_deploy_token_monthly.yml
index 446543fb877..b2e1078cd52 100644
--- a/config/metrics/counts_28d/20231227174251_i_container_registry_delete_tag_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20231227174251_i_container_registry_delete_tag_deploy_token_monthly.yml
@@ -14,9 +14,6 @@ options:
   events:
   - i_container_registry_delete_tag_deploy_token
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20231227175541_i_container_registry_push_repository_deploy_token_monthly.yml b/config/metrics/counts_28d/20231227175541_i_container_registry_push_repository_deploy_token_monthly.yml
index 91f4d2ed753..b21078fa2b3 100644
--- a/config/metrics/counts_28d/20231227175541_i_container_registry_push_repository_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20231227175541_i_container_registry_push_repository_deploy_token_monthly.yml
@@ -14,9 +14,6 @@ options:
   events:
   - i_container_registry_push_repository_deploy_token
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20231227175706_i_container_registry_delete_repository_deploy_token_monthly.yml b/config/metrics/counts_28d/20231227175706_i_container_registry_delete_repository_deploy_token_monthly.yml
index fae26cb895c..fe9fb83496d 100644
--- a/config/metrics/counts_28d/20231227175706_i_container_registry_delete_repository_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20231227175706_i_container_registry_delete_repository_deploy_token_monthly.yml
@@ -14,9 +14,6 @@ options:
   events:
   - i_container_registry_delete_repository_deploy_token
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20231227180108_i_container_registry_create_repository_deploy_token_monthly.yml b/config/metrics/counts_28d/20231227180108_i_container_registry_create_repository_deploy_token_monthly.yml
index 6cb4d6069ef..417c4f1c61d 100644
--- a/config/metrics/counts_28d/20231227180108_i_container_registry_create_repository_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20231227180108_i_container_registry_create_repository_deploy_token_monthly.yml
@@ -14,9 +14,6 @@ options:
   events:
   - i_container_registry_create_repository_deploy_token
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20240118133234_i_quickactions_remove_parent_monthly.yml b/config/metrics/counts_28d/20240118133234_i_quickactions_remove_parent_monthly.yml
index 21855e3d1d5..794ecba91b7 100644
--- a/config/metrics/counts_28d/20240118133234_i_quickactions_remove_parent_monthly.yml
+++ b/config/metrics/counts_28d/20240118133234_i_quickactions_remove_parent_monthly.yml
@@ -15,9 +15,6 @@ options:
   events:
     - i_quickactions_remove_parent
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20240130072055_p_ci_templates_opentofu_base_latest_monthly.yml b/config/metrics/counts_28d/20240130072055_p_ci_templates_opentofu_base_latest_monthly.yml
index 86cc16b601d..c2c7508c9ef 100644
--- a/config/metrics/counts_28d/20240130072055_p_ci_templates_opentofu_base_latest_monthly.yml
+++ b/config/metrics/counts_28d/20240130072055_p_ci_templates_opentofu_base_latest_monthly.yml
@@ -10,9 +10,6 @@ time_frame: 28d
 data_source: redis_hll
 data_category: optional
 instrumentation_class: RedisHLLMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20240130072115_p_ci_templates_opentofu_latest_monthly.yml b/config/metrics/counts_28d/20240130072115_p_ci_templates_opentofu_latest_monthly.yml
index c5a04ec53da..0001c1916e8 100644
--- a/config/metrics/counts_28d/20240130072115_p_ci_templates_opentofu_latest_monthly.yml
+++ b/config/metrics/counts_28d/20240130072115_p_ci_templates_opentofu_latest_monthly.yml
@@ -10,9 +10,6 @@ time_frame: 28d
 data_source: redis_hll
 data_category: optional
 instrumentation_class: RedisHLLMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20240208152527_i_quickactions_remove_child_monthly.yml b/config/metrics/counts_28d/20240208152527_i_quickactions_remove_child_monthly.yml
index 0adcadd0f7d..2f604776058 100644
--- a/config/metrics/counts_28d/20240208152527_i_quickactions_remove_child_monthly.yml
+++ b/config/metrics/counts_28d/20240208152527_i_quickactions_remove_child_monthly.yml
@@ -15,9 +15,6 @@ options:
   events:
     - i_quickactions_remove_child
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20240418165317_i_quickactions_remind_me_monthly.yml b/config/metrics/counts_28d/20240418165317_i_quickactions_remind_me_monthly.yml
index e0d9b900ae1..9f86ec6cf1f 100644
--- a/config/metrics/counts_28d/20240418165317_i_quickactions_remind_me_monthly.yml
+++ b/config/metrics/counts_28d/20240418165317_i_quickactions_remind_me_monthly.yml
@@ -14,9 +14,6 @@ performance_indicator_type: []
 options:
   events:
   - i_quickactions_remind_me
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20240510144357_p_ci_templates_security_api_security_latest_monthly.yml b/config/metrics/counts_28d/20240510144357_p_ci_templates_security_api_security_latest_monthly.yml
index ffd71748346..9155f8a4b78 100644
--- a/config/metrics/counts_28d/20240510144357_p_ci_templates_security_api_security_latest_monthly.yml
+++ b/config/metrics/counts_28d/20240510144357_p_ci_templates_security_api_security_latest_monthly.yml
@@ -10,9 +10,6 @@ time_frame: 28d
 data_source: redis_hll
 data_category: optional
 instrumentation_class: RedisHLLMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20240510144357_p_ci_templates_security_api_security_monthly.yml b/config/metrics/counts_28d/20240510144357_p_ci_templates_security_api_security_monthly.yml
index 894fcf71cb1..da38574ef51 100644
--- a/config/metrics/counts_28d/20240510144357_p_ci_templates_security_api_security_monthly.yml
+++ b/config/metrics/counts_28d/20240510144357_p_ci_templates_security_api_security_monthly.yml
@@ -10,9 +10,6 @@ time_frame: 28d
 data_source: redis_hll
 data_category: optional
 instrumentation_class: RedisHLLMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_label_from_render_glql_block_monthly.yml b/config/metrics/counts_28d/count_distinct_label_from_render_glql_block_monthly.yml
index 93298b65ae6..4b0e32f8043 100644
--- a/config/metrics/counts_28d/count_distinct_label_from_render_glql_block_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_label_from_render_glql_block_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167165
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_namespace_id_from_pull_ml_model_monthly.yml b/config/metrics/counts_28d/count_distinct_namespace_id_from_pull_ml_model_monthly.yml
index 678475fa073..8e3eafb9479 100644
--- a/config/metrics/counts_28d/count_distinct_namespace_id_from_pull_ml_model_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_namespace_id_from_pull_ml_model_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173261
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_namespace_id_from_push_ml_model_monthly.yml b/config/metrics/counts_28d/count_distinct_namespace_id_from_push_ml_model_monthly.yml
index 9cb9b85bcfe..c957facdea3 100644
--- a/config/metrics/counts_28d/count_distinct_namespace_id_from_push_ml_model_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_namespace_id_from_push_ml_model_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173261
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_ci_catalog_component_included_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_ci_catalog_component_included_monthly.yml
index ed82e60f075..e88b097fc35 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_ci_catalog_component_included_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_ci_catalog_component_included_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/146834
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_ci_template_included_28d.yml b/config/metrics/counts_28d/count_distinct_project_id_from_ci_template_included_28d.yml
index 345a41f4a7a..730a510ca1f 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_ci_template_included_28d.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_ci_template_included_28d.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132819
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_click_delete_pod_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_click_delete_pod_monthly.yml
index a8337867ea2..e558ee5bf6b 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_click_delete_pod_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_click_delete_pod_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/160635
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_create_ci_internal_pipeline_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_create_ci_internal_pipeline_monthly.yml
index 39b79c5f21a..b4730023f9d 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_create_ci_internal_pipeline_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_create_ci_internal_pipeline_monthly.yml
@@ -11,9 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/163352
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_create_ci_internal_pipeline_with_repository_source_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_create_ci_internal_pipeline_with_repository_source_monthly.yml
index c16750c0412..3f493057f7d 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_create_ci_internal_pipeline_with_repository_source_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_create_ci_internal_pipeline_with_repository_source_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/163352
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_create_pages_deployment_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_create_pages_deployment_monthly.yml
index 83da2d1440f..375af613536 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_create_pages_deployment_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_create_pages_deployment_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157474
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_create_wiki_page_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_create_wiki_page_monthly.yml
index d8ba5c75bdc..90c0aaf4579 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_create_wiki_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_create_wiki_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158070
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_create_wiki_page_template_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_create_wiki_page_template_monthly.yml
index 340e2faef87..c30c323511b 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_create_wiki_page_template_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_create_wiki_page_template_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/159484
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_delete_wiki_page_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_delete_wiki_page_monthly.yml
index 884eaf71fae..e6e38ec3f7c 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_delete_wiki_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_delete_wiki_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158070
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_delete_wiki_page_template_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_delete_wiki_page_template_monthly.yml
index 03b7c1f6bd6..4b1978b31e2 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_delete_wiki_page_template_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_delete_wiki_page_template_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/159484
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_disable_inbound_job_token_scope_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_disable_inbound_job_token_scope_monthly.yml
index d6764c34c90..995af86908d 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_disable_inbound_job_token_scope_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_disable_inbound_job_token_scope_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/171945
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_enable_inbound_job_token_scope_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_enable_inbound_job_token_scope_monthly.yml
index 8f385a27e24..8144b11df03 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_enable_inbound_job_token_scope_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_enable_inbound_job_token_scope_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/171945
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_job_token_cross_project_auth_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_job_token_cross_project_auth_monthly.yml
index c2a4e39f039..855b62c63a9 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_job_token_cross_project_auth_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_job_token_cross_project_auth_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173400
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_job_token_same_project_auth_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_job_token_same_project_auth_monthly.yml
index f2701a0c055..f168465eeb6 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_job_token_same_project_auth_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_job_token_same_project_auth_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173400
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_pull_ml_model_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_pull_ml_model_monthly.yml
index d470c71f291..b2e62af28de 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_pull_ml_model_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_pull_ml_model_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173261
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_push_ml_model_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_push_ml_model_monthly.yml
index 46411a7f5ae..54e918a4897 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_push_ml_model_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_push_ml_model_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173261
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_register_agent_at_kas_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_register_agent_at_kas_monthly.yml
index 3a8056f8594..ca95614503f 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_register_agent_at_kas_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_register_agent_at_kas_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154883
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_update_wiki_page_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_update_wiki_page_monthly.yml
index d413074752a..9cbbb466d0f 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_update_wiki_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_update_wiki_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158070
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_update_wiki_page_template_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_update_wiki_page_template_monthly.yml
index 95cfb5970e1..f0b76c01374 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_update_wiki_page_template_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_update_wiki_page_template_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/159484
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_view_wiki_page_monthly.yml b/config/metrics/counts_28d/count_distinct_project_id_from_view_wiki_page_monthly.yml
index d43710484ec..7d42d9dca24 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_view_wiki_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_view_wiki_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158070
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_apply_wiki_template_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_apply_wiki_template_monthly.yml
index 69d2b7b9f50..39008387060 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_apply_wiki_template_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_apply_wiki_template_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/161130
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_branch_rule_details_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_branch_rule_details_monthly.yml
index 9da21beb6da..62e289bcef3 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_branch_rule_details_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_branch_rule_details_monthly.yml
@@ -10,8 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/160591
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
 tiers:
 - free
 events:
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_branch_rules_settings_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_branch_rules_settings_monthly.yml
index 0166e4df727..3922dc89426 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_branch_rules_settings_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_branch_rules_settings_monthly.yml
@@ -10,8 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/160591
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
 tiers:
 - free
 events:
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_all_gitlab_scoped_search_to_advanced_search_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_all_gitlab_scoped_search_to_advanced_search_monthly.yml
index 1ab99789e4d..24e5715cfff 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_all_gitlab_scoped_search_to_advanced_search_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_all_gitlab_scoped_search_to_advanced_search_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154395
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_blame_control_on_blob_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_blame_control_on_blob_page_monthly.yml
index 1b497a29587..4e7925a7955 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_blame_control_on_blob_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_blame_control_on_blob_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147673
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_blob_results_show_more_less_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_blob_results_show_more_less_monthly.yml
index 85a5be2e977..10de3c39918 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_blob_results_show_more_less_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_blob_results_show_more_less_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/161308
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_chunk_blame_on_blob_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_chunk_blame_on_blob_page_monthly.yml
index 3652555a64a..5d1c791d45d 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_chunk_blame_on_blob_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_chunk_blame_on_blob_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147673
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_clipboard_button_in_multimatch_file_header_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_clipboard_button_in_multimatch_file_header_monthly.yml
index 02dbc2e33b7..43eda66948e 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_clipboard_button_in_multimatch_file_header_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_clipboard_button_in_multimatch_file_header_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/161308
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_commands_sub_menu_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_commands_sub_menu_in_command_palette_monthly.yml
index ee4e89a5779..4ddf466d5e2 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_commands_sub_menu_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_commands_sub_menu_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154150
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_comment_filter_toggle_bot_comments_in_mr_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_comment_filter_toggle_bot_comments_in_mr_monthly.yml
index 421fbd4f681..1b96d09e4f2 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_comment_filter_toggle_bot_comments_in_mr_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_comment_filter_toggle_bot_comments_in_mr_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/146940
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_comment_filter_toggle_user_comments_in_mr_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_comment_filter_toggle_user_comments_in_mr_monthly.yml
index c3d42370842..9e59cde04dc 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_comment_filter_toggle_user_comments_in_mr_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_comment_filter_toggle_user_comments_in_mr_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/146939
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_delete_pod_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_delete_pod_monthly.yml
index b4eda166bae..9ee26440768 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_delete_pod_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_delete_pod_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/160635
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_expand_panel_on_settings_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_expand_panel_on_settings_monthly.yml
index 026731549f2..82ef3f17688 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_expand_panel_on_settings_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_expand_panel_on_settings_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/451458
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_explore_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_explore_in_command_palette_monthly.yml
index db9b878e9e3..485702b7f0a 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_explore_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_explore_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154395
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_find_file_button_on_repository_pages_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_find_file_button_on_repository_pages_monthly.yml
index 3e568b59cbe..20fbcee52fe 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_find_file_button_on_repository_pages_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_find_file_button_on_repository_pages_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/155457
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_frequent_group_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_frequent_group_in_command_palette_monthly.yml
index 11aacf402af..fd0e975223e 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_frequent_group_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_frequent_group_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154150
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_frequent_project_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_frequent_project_in_command_palette_monthly.yml
index 147517aaed2..56d36e1923a 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_frequent_project_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_frequent_project_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154150
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_go_to_file_shortcut_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_go_to_file_shortcut_monthly.yml
index 9c8f3035f04..014e09ec487 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_go_to_file_shortcut_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_go_to_file_shortcut_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/155457
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_group_result_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_group_result_in_command_palette_monthly.yml
index d573ede5a3c..4fe8f8c90a8 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_group_result_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_group_result_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151657
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_group_scoped_search_to_advanced_search_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_group_scoped_search_to_advanced_search_monthly.yml
index 7ee775c92f6..010483ef03e 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_group_scoped_search_to_advanced_search_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_group_scoped_search_to_advanced_search_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154395
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_header_link_of_blob_result_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_header_link_of_blob_result_monthly.yml
index ac4458f39e5..80a65f114cd 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_header_link_of_blob_result_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_header_link_of_blob_result_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/161308
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_history_control_on_blob_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_history_control_on_blob_page_monthly.yml
index efdcc08d239..e4fa06e9b38 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_history_control_on_blob_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_history_control_on_blob_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147673
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_issue_result_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_issue_result_in_command_palette_monthly.yml
index 49188c602fb..281a2bd313b 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_issue_result_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_issue_result_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154576
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_issues_assigned_to_me_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_issues_assigned_to_me_in_command_palette_monthly.yml
index 7a93e2fbbce..056dd58aaf0 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_issues_assigned_to_me_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_issues_assigned_to_me_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147919
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_issues_i_created_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_issues_i_created_in_command_palette_monthly.yml
index 00c9aa739f0..cbf6bdf0cae 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_issues_i_created_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_issues_i_created_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147919
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_merge_request_result_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_merge_request_result_in_command_palette_monthly.yml
index 72ba7730bb2..0b7dab78bfe 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_merge_request_result_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_merge_request_result_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154576
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_merge_requests_assigned_to_me_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_merge_requests_assigned_to_me_in_command_palette_monthly.yml
index 5fc6579c73a..6897f09d962 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_merge_requests_assigned_to_me_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_merge_requests_assigned_to_me_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147919
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_merge_requests_i_created_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_merge_requests_i_created_in_command_palette_monthly.yml
index 9013dd2074f..c95ff5dd9ca 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_merge_requests_i_created_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_merge_requests_i_created_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147919
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_merge_requests_that_im_a_reviewer_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_merge_requests_that_im_a_reviewer_in_command_palette_monthly.yml
index d5fea7f9704..f1f659606d2 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_merge_requests_that_im_a_reviewer_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_merge_requests_that_im_a_reviewer_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147919
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_new_project_projects_explore_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_new_project_projects_explore_monthly.yml
index ffde29f2ad0..08397f892b8 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_new_project_projects_explore_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_new_project_projects_explore_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158282
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_outside_of_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_outside_of_command_palette_monthly.yml
index 6d6793bc617..231f2a71061 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_outside_of_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_outside_of_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151681
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_preferences_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_preferences_in_command_palette_monthly.yml
index 58816c4cae6..8d3b5b6246b 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_preferences_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_preferences_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154395
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_previous_blame_on_blob_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_previous_blame_on_blob_page_monthly.yml
index a0b1ba71ae3..85c53dc13f7 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_previous_blame_on_blob_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_previous_blame_on_blob_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147673
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_print_as_pdf_in_wiki_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_print_as_pdf_in_wiki_page_monthly.yml
index ce60828be90..f02890008df 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_print_as_pdf_in_wiki_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_print_as_pdf_in_wiki_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/161978
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_profile_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_profile_in_command_palette_monthly.yml
index 321ec697115..b89a8f81c00 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_profile_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_profile_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154395
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_project_result_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_project_result_in_command_palette_monthly.yml
index 2503e754ba3..ec797ce6de7 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_project_result_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_project_result_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151655
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_project_scoped_search_to_advanced_search_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_project_scoped_search_to_advanced_search_monthly.yml
index 1afb6453017..ef601b82a51 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_project_scoped_search_to_advanced_search_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_project_scoped_search_to_advanced_search_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154395
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_project_setting_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_project_setting_in_command_palette_monthly.yml
index 17be2d6af8e..303258f1d9f 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_project_setting_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_project_setting_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/163735
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_recent_epic_result_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_recent_epic_result_in_command_palette_monthly.yml
index 9f4be68007f..ff4050df954 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_recent_epic_result_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_recent_epic_result_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154576
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_recent_issue_result_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_recent_issue_result_in_command_palette_monthly.yml
index cb7059a2565..20ae9639b8a 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_recent_issue_result_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_recent_issue_result_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154576
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_recent_merge_request_result_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_recent_merge_request_result_in_command_palette_monthly.yml
index e587bfd1463..ff042ae50a5 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_recent_merge_request_result_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_recent_merge_request_result_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154576
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_redact_text_button_repository_settings_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_redact_text_button_repository_settings_monthly.yml
index a77bab6319d..2bc3d072cea 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_redact_text_button_repository_settings_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_redact_text_button_repository_settings_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158034
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_ref_selector_on_blob_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_ref_selector_on_blob_page_monthly.yml
index 8356f55625f..9badeb3270c 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_ref_selector_on_blob_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_ref_selector_on_blob_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147673
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_regex_button_in_search_page_input_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_regex_button_in_search_page_input_monthly.yml
index 38a6ba15697..8863961b6f2 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_regex_button_in_search_page_input_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_regex_button_in_search_page_input_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147919
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_remove_blob_button_repository_settings_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_remove_blob_button_repository_settings_monthly.yml
index 08bb229e537..f7732a8972b 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_remove_blob_button_repository_settings_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_remove_blob_button_repository_settings_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158031
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_search_blob_result_blame_line_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_search_blob_result_blame_line_monthly.yml
index 0ad010b8d9b..4df433ca43e 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_search_blob_result_blame_line_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_search_blob_result_blame_line_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/161308
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_search_blob_result_line_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_search_blob_result_line_monthly.yml
index 3f249b2341f..7d18ba564dd 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_search_blob_result_line_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_search_blob_result_line_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/161308
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_search_button_to_activate_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_search_button_to_activate_command_palette_monthly.yml
index eaee1cb9c7c..a41b71d5352 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_search_button_to_activate_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_search_button_to_activate_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151651
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_search_result_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_search_result_monthly.yml
index fa7708d29b9..aeacb920ae9 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_search_result_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_search_result_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156499
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_tab_projects_explore_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_tab_projects_explore_monthly.yml
index 19be47d2646..36b4ac5e18e 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_tab_projects_explore_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_tab_projects_explore_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158282
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_top_right_search_button_to_activate_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_top_right_search_button_to_activate_command_palette_monthly.yml
index 50cce05f30e..ffb16ece9cc 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_top_right_search_button_to_activate_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_top_right_search_button_to_activate_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151651
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_trigger_flux_reconciliation_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_trigger_flux_reconciliation_monthly.yml
index 694a46ad8fd..d2cecd33dcb 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_trigger_flux_reconciliation_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_trigger_flux_reconciliation_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/162017
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_trigger_flux_resume_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_trigger_flux_resume_monthly.yml
index e88e3768033..b8a79e1e08e 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_trigger_flux_resume_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_trigger_flux_resume_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165955
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_trigger_flux_suspend_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_trigger_flux_suspend_monthly.yml
index 47ab8a63f9e..2da81036901 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_trigger_flux_suspend_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_trigger_flux_suspend_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165955
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_user_result_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_user_result_in_command_palette_monthly.yml
index f35e5228dec..127465f055e 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_user_result_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_user_result_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147919
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_view_all_link_in_pipeline_analytics_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_view_all_link_in_pipeline_analytics_monthly.yml
index 7e0772c6f1c..789d4e7d1be 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_view_all_link_in_pipeline_analytics_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_view_all_link_in_pipeline_analytics_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158957
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_your_work_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_your_work_in_command_palette_monthly.yml
index f5380a09180..e199b5dc903 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_your_work_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_your_work_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154395
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_click_zoekt_include_forks_on_search_results_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_click_zoekt_include_forks_on_search_results_page_monthly.yml
index 3f1313cd64f..a8df9666aef 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_click_zoekt_include_forks_on_search_results_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_click_zoekt_include_forks_on_search_results_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154099
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_create_ci_build_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_create_ci_build_monthly.yml
index d816ab03166..11fd226ac98 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_create_ci_build_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_create_ci_build_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141421
 time_frame: 28d
 data_source: internal_events
 data_category: operational
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_create_ci_internal_pipeline_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_create_ci_internal_pipeline_monthly.yml
index 014de533639..01800a2bac5 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_create_ci_internal_pipeline_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_create_ci_internal_pipeline_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/142356
 time_frame: 28d
 data_source: internal_events
 data_category: operational
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_create_group_wiki_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_create_group_wiki_page_monthly.yml
index d299300f324..1219e85a4ba 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_create_group_wiki_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_create_group_wiki_page_monthly.yml
@@ -10,8 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167091
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ee
 tiers:
 - premium
 - ultimate
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_create_pages_deployment_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_create_pages_deployment_monthly.yml
index a01b970bebe..7a76665be19 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_create_pages_deployment_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_create_pages_deployment_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157474
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_create_wiki_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_create_wiki_page_monthly.yml
index 908663078af..81101b41d6e 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_create_wiki_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_create_wiki_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158070
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_create_wiki_page_template_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_create_wiki_page_template_monthly.yml
index 1db4cc41ac2..cfb1ff0aa22 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_create_wiki_page_template_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_create_wiki_page_template_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/159484
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_delete_group_wiki_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_delete_group_wiki_page_monthly.yml
index 794d84ab509..7d525ac2bfe 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_delete_group_wiki_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_delete_group_wiki_page_monthly.yml
@@ -10,8 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167091
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ee
 tiers:
 - premium
 - ultimate
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_delete_wiki_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_delete_wiki_page_monthly.yml
index 398d21ac46f..23d9b54b29b 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_delete_wiki_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_delete_wiki_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158070
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_delete_wiki_page_template_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_delete_wiki_page_template_monthly.yml
index 9d4f170a91f..eab6cdc2958 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_delete_wiki_page_template_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_delete_wiki_page_template_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/159484
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_fail_arkose_challenge_during_registration_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_fail_arkose_challenge_during_registration_monthly.yml
index e6102376eb4..8b28f91dd6a 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_fail_arkose_challenge_during_registration_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_fail_arkose_challenge_during_registration_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154803
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_i_quickactions_remove_email_multiple_28d.yml b/config/metrics/counts_28d/count_distinct_user_id_from_i_quickactions_remove_email_multiple_28d.yml
index 9ac112aecd5..b1b68a35ce5 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_i_quickactions_remove_email_multiple_28d.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_i_quickactions_remove_email_multiple_28d.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138178
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_i_quickactions_remove_email_single_28d.yml b/config/metrics/counts_28d/count_distinct_user_id_from_i_quickactions_remove_email_single_28d.yml
index d1633a8df02..369bd607060 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_i_quickactions_remove_email_single_28d.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_i_quickactions_remove_email_single_28d.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138178
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_new_mr_dashboard_to_old_mr_dashboard_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_new_mr_dashboard_to_old_mr_dashboard_monthly.yml
index 49ff33579e9..32bb7d48022 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_new_mr_dashboard_to_old_mr_dashboard_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_new_mr_dashboard_to_old_mr_dashboard_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/475243
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_old_mr_dashboard_to_new_mr_dashboard_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_old_mr_dashboard_to_new_mr_dashboard_monthly.yml
index 078863291c6..610b3a23dd8 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_old_mr_dashboard_to_new_mr_dashboard_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_old_mr_dashboard_to_new_mr_dashboard_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/475243
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_open_blame_viewer_on_blob_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_open_blame_viewer_on_blob_page_monthly.yml
index e693572cd79..10a5e141e57 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_open_blame_viewer_on_blob_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_open_blame_viewer_on_blob_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147673
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_open_kubernetes_resource_details_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_open_kubernetes_resource_details_monthly.yml
index 8d2e3f729cb..4359a3b6ed2 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_open_kubernetes_resource_details_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_open_kubernetes_resource_details_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165366
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_press_at_symbol_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_press_at_symbol_in_command_palette_monthly.yml
index c7900321dd6..74c313334d9 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_press_at_symbol_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_press_at_symbol_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151681
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_press_colon_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_press_colon_in_command_palette_monthly.yml
index 1a26cd3b372..33238ef980e 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_press_colon_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_press_colon_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151681
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_press_enter_to_advanced_search_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_press_enter_to_advanced_search_monthly.yml
index 64b33e6ec80..933952fbe3f 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_press_enter_to_advanced_search_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_press_enter_to_advanced_search_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151681
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_press_escape_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_press_escape_in_command_palette_monthly.yml
index 6672621e924..ec98166d93a 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_press_escape_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_press_escape_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151681
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_press_forward_slash_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_press_forward_slash_in_command_palette_monthly.yml
index 308ac3f96ce..66eee4fe290 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_press_forward_slash_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_press_forward_slash_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151681
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_press_greater_than_in_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_press_greater_than_in_command_palette_monthly.yml
index 4a47515816e..8af76a5ae36 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_press_greater_than_in_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_press_greater_than_in_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151681
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_press_keyboard_shortcut_to_activate_command_palette_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_press_keyboard_shortcut_to_activate_command_palette_monthly.yml
index ceebeefa666..88dff8b545e 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_press_keyboard_shortcut_to_activate_command_palette_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_press_keyboard_shortcut_to_activate_command_palette_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151645
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_render_glql_block_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_render_glql_block_monthly.yml
index f5530100874..0c547376544 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_render_glql_block_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_render_glql_block_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167165
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_select_source_branch_exclude_filter_on_merge_request_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_select_source_branch_exclude_filter_on_merge_request_page_monthly.yml
index ae85f0cc513..a0ecfeaba6d 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_select_source_branch_exclude_filter_on_merge_request_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_select_source_branch_exclude_filter_on_merge_request_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156491
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_select_source_branch_include_filter_on_merge_request_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_select_source_branch_include_filter_on_merge_request_page_monthly.yml
index 8c64c13b119..4cca2b9d63f 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_select_source_branch_include_filter_on_merge_request_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_select_source_branch_include_filter_on_merge_request_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156491
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_28d.yml b/config/metrics/counts_28d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_28d.yml
index b72b1c7bc85..fffa767bb70 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_28d.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_28d.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137564
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_update_group_wiki_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_update_group_wiki_page_monthly.yml
index f40e4cfa035..aeb547640d7 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_update_group_wiki_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_update_group_wiki_page_monthly.yml
@@ -10,8 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167091
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ee
 tiers:
 - premium
 - ultimate
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_update_wiki_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_update_wiki_page_monthly.yml
index 31652053d5a..115fbbbe3ef 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_update_wiki_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_update_wiki_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158070
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_update_wiki_page_template_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_update_wiki_page_template_monthly.yml
index f257e0771aa..5786d9f75d2 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_update_wiki_page_template_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_update_wiki_page_template_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/159484
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_use_filter_bar_projects_explore_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_use_filter_bar_projects_explore_monthly.yml
index 06b817349c9..090a41389ae 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_use_filter_bar_projects_explore_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_use_filter_bar_projects_explore_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158282
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_use_pagination_projects_explore_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_use_pagination_projects_explore_monthly.yml
index 79b054e4e8a..0567d0a90ef 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_use_pagination_projects_explore_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_use_pagination_projects_explore_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158282
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_use_sort_projects_explore_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_use_sort_projects_explore_monthly.yml
index 8953c21b74e..aeaaaf0f20f 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_use_sort_projects_explore_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_use_sort_projects_explore_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158282
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_user_clicks_comment_filter_dropdown_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_user_clicks_comment_filter_dropdown_monthly.yml
index 9f0f6a161a5..5de2c0b9073 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_user_clicks_comment_filter_dropdown_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_user_clicks_comment_filter_dropdown_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/145998
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_abuse_reports_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_abuse_reports_pageload_monthly.yml
index a12dcb96187..5e50d31fb6a 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_abuse_reports_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_abuse_reports_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157477
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_advanced_search_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_advanced_search_pageload_monthly.yml
index 9a6434fcc8e..eb5c0aa9607 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_advanced_search_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_advanced_search_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158122
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_analytics_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_analytics_pageload_monthly.yml
index f5cb58f4aa5..4908085d425 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_analytics_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_analytics_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158263
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_appearance_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_appearance_pageload_monthly.yml
index e569f2e0b65..8733dd992b8 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_appearance_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_appearance_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158261
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_ci_cd_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_ci_cd_pageload_monthly.yml
index f2d8c460b1a..838d6a6ae83 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_ci_cd_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_ci_cd_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158131
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_general_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_general_pageload_monthly.yml
index 76f570986f4..ccdbd518ed6 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_general_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_general_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158118
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_integrations_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_integrations_pageload_monthly.yml
index bbb6a84263f..82b44ba9779 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_integrations_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_integrations_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158128
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_network_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_network_pageload_monthly.yml
index c32d8165e1e..c0c34fc0d38 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_network_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_network_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158235
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_preferences_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_preferences_pageload_monthly.yml
index 2342dc3295b..76d7eaa815e 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_preferences_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_preferences_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158262
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_reporting_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_reporting_pageload_monthly.yml
index 94acd5fb796..a4695e42e4b 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_reporting_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_reporting_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158230
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_repository_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_repository_pageload_monthly.yml
index 7dc357dc548..24a08f4833e 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_repository_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_repository_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158130
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_templates_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_templates_pageload_monthly.yml
index 7741b8beaf7..abd25883166 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_templates_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_application_settings_templates_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158231
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_applications_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_applications_pageload_monthly.yml
index ea2d4551941..2c86939ade7 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_applications_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_applications_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157473
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_audit_logs_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_audit_logs_pageload_monthly.yml
index e07888da0de..f2ff247c718 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_audit_logs_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_audit_logs_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156830
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_background_jobs_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_background_jobs_pageload_monthly.yml
index 59875924e30..1e3637b5ae1 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_background_jobs_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_background_jobs_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156827
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_background_migrations_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_background_migrations_pageload_monthly.yml
index 0ff81a6f60f..52a770d4e6d 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_background_migrations_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_background_migrations_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156826
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_broadcast_messages_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_broadcast_messages_pageload_monthly.yml
index 34fea57f504..3e159784954 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_broadcast_messages_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_broadcast_messages_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157466
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_credentials_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_credentials_pageload_monthly.yml
index bc8cdb31886..679b6e6ded2 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_credentials_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_credentials_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157522
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_dashboard_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_dashboard_pageload_monthly.yml
index 16a25db04f2..42210f10985 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_dashboard_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_dashboard_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156645
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_deploy_keys_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_deploy_keys_pageload_monthly.yml
index a6ff19693c7..746898232a7 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_deploy_keys_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_deploy_keys_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157520
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_dev_ops_reports_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_dev_ops_reports_pageload_monthly.yml
index 2787bf38281..7663aca024b 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_dev_ops_reports_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_dev_ops_reports_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156816
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_geo_settings_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_geo_settings_pageload_monthly.yml
index e4b8d882c64..7c18c930c20 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_geo_settings_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_geo_settings_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157498
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - premium
 - ultimate
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_geo_sites_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_geo_sites_pageload_monthly.yml
index ca1d49f32dd..11064101765 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_geo_sites_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_geo_sites_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157497
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_gitaly_servers_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_gitaly_servers_pageload_monthly.yml
index 3b0e1194e8e..9bd0e5765b2 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_gitaly_servers_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_gitaly_servers_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156811
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_groups_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_groups_pageload_monthly.yml
index 628c4ee8f6d..77c6f4879cb 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_groups_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_groups_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156807
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_health_check_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_health_check_pageload_monthly.yml
index d3a5c6e5f59..0980762796f 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_health_check_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_health_check_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156829
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_hooks_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_hooks_pageload_monthly.yml
index b4a60285b7e..79fbd3700a6 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_hooks_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_hooks_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157469
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_jobs_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_jobs_pageload_monthly.yml
index 735e5db01dd..ade8c529888 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_jobs_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_jobs_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156814
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_labels_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_labels_pageload_monthly.yml
index 6a37b6736d9..8db52fe0483 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_labels_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_labels_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157524
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_projects_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_projects_pageload_monthly.yml
index cc59840ad7a..3038557f95b 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_projects_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_projects_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156805
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_push_rule_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_push_rule_pageload_monthly.yml
index 8f7d933e8b1..56cb0fdea7b 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_push_rule_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_push_rule_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157494
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_runners_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_runners_pageload_monthly.yml
index f6ed8d29ed7..4d81e37c735 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_runners_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_runners_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156812
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_subscription_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_subscription_pageload_monthly.yml
index 625bc3f111d..57ca9543131 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_subscription_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_subscription_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157478
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_system_info_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_system_info_pageload_monthly.yml
index 10587c14786..638d4925061 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_system_info_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_system_info_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156825
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_topics_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_topics_pageload_monthly.yml
index aa6d01e96ed..8b5d79c6c58 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_topics_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_topics_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156810
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_usage_trends_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_usage_trends_pageload_monthly.yml
index 53e192d1707..94678fa9a4c 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_usage_trends_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_usage_trends_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156817
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_users_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_users_pageload_monthly.yml
index ee0983fe65d..62fa13d9a18 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_users_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_users_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156806
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_wiki_page_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_wiki_page_monthly.yml
index 1de665c5add..9c3fa3931e9 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_view_wiki_page_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_wiki_page_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158070
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_users_from_view_admin_application_settings_metrics_and_profiling_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_users_from_view_admin_application_settings_metrics_and_profiling_pageload_monthly.yml
index 7406612412b..8aa342a9097 100644
--- a/config/metrics/counts_28d/count_distinct_users_from_view_admin_application_settings_metrics_and_profiling_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_users_from_view_admin_application_settings_metrics_and_profiling_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158234
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_users_from_view_admin_application_settings_roles_and_permissions_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_users_from_view_admin_application_settings_roles_and_permissions_pageload_monthly.yml
index 259cf1747c4..e947453c7bf 100644
--- a/config/metrics/counts_28d/count_distinct_users_from_view_admin_application_settings_roles_and_permissions_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_users_from_view_admin_application_settings_roles_and_permissions_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158120
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_distinct_users_from_view_admin_application_settings_sec_and_compliance_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_users_from_view_admin_application_settings_sec_and_compliance_pageload_monthly.yml
index df7165a8d70..64f16a4a49f 100644
--- a/config/metrics/counts_28d/count_distinct_users_from_view_admin_application_settings_sec_and_compliance_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_distinct_users_from_view_admin_application_settings_sec_and_compliance_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158225
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_click_comment_filter_toggle_bot_comments_in_mr_monthly.yml b/config/metrics/counts_28d/count_total_click_comment_filter_toggle_bot_comments_in_mr_monthly.yml
index 838e48ff1dd..2ce246be684 100644
--- a/config/metrics/counts_28d/count_total_click_comment_filter_toggle_bot_comments_in_mr_monthly.yml
+++ b/config/metrics/counts_28d/count_total_click_comment_filter_toggle_bot_comments_in_mr_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/146940
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_click_comment_filter_toggle_user_comments_in_mr_monthly.yml b/config/metrics/counts_28d/count_total_click_comment_filter_toggle_user_comments_in_mr_monthly.yml
index 00e56ed7efa..d637264e5b8 100644
--- a/config/metrics/counts_28d/count_total_click_comment_filter_toggle_user_comments_in_mr_monthly.yml
+++ b/config/metrics/counts_28d/count_total_click_comment_filter_toggle_user_comments_in_mr_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/146939
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_commit_change_to_ciconfigfile_monthly.yml b/config/metrics/counts_28d/count_total_commit_change_to_ciconfigfile_monthly.yml
index b8e16ce1659..07a8860c297 100644
--- a/config/metrics/counts_28d/count_total_commit_change_to_ciconfigfile_monthly.yml
+++ b/config/metrics/counts_28d/count_total_commit_change_to_ciconfigfile_monthly.yml
@@ -11,9 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166870
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_create_ci_build_monthly.yml b/config/metrics/counts_28d/count_total_create_ci_build_monthly.yml
index 5055336a60b..aa02b47ccb3 100644
--- a/config/metrics/counts_28d/count_total_create_ci_build_monthly.yml
+++ b/config/metrics/counts_28d/count_total_create_ci_build_monthly.yml
@@ -11,9 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141421
 time_frame: 28d
 data_source: internal_events
 data_category: operational
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_create_ci_internal_pipeline_monthly.yml b/config/metrics/counts_28d/count_total_create_ci_internal_pipeline_monthly.yml
index 3e1b23b34e8..02b830d55b7 100644
--- a/config/metrics/counts_28d/count_total_create_ci_internal_pipeline_monthly.yml
+++ b/config/metrics/counts_28d/count_total_create_ci_internal_pipeline_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/142356
 time_frame: 28d
 data_source: internal_events
 data_category: operational
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_create_ci_internal_pipeline_with_schedule_monthly.yml b/config/metrics/counts_28d/count_total_create_ci_internal_pipeline_with_schedule_monthly.yml
index c4f8857ede7..4e73df707a7 100644
--- a/config/metrics/counts_28d/count_total_create_ci_internal_pipeline_with_schedule_monthly.yml
+++ b/config/metrics/counts_28d/count_total_create_ci_internal_pipeline_with_schedule_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/163352
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_create_ci_pipeline_internal_with_repository_source_monthly.yml b/config/metrics/counts_28d/count_total_create_ci_pipeline_internal_with_repository_source_monthly.yml
index 505eb1f0d1b..686ca1ebd3b 100644
--- a/config/metrics/counts_28d/count_total_create_ci_pipeline_internal_with_repository_source_monthly.yml
+++ b/config/metrics/counts_28d/count_total_create_ci_pipeline_internal_with_repository_source_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/163352
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_create_group_wiki_page_monthly.yml b/config/metrics/counts_28d/count_total_create_group_wiki_page_monthly.yml
index 137b389c0fa..2e2c7ae021a 100644
--- a/config/metrics/counts_28d/count_total_create_group_wiki_page_monthly.yml
+++ b/config/metrics/counts_28d/count_total_create_group_wiki_page_monthly.yml
@@ -10,8 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167091
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ee
 tiers:
 - premium
 - ultimate
diff --git a/config/metrics/counts_28d/count_total_delete_group_wiki_page_monthly.yml b/config/metrics/counts_28d/count_total_delete_group_wiki_page_monthly.yml
index b02750b67b3..f0f34776fae 100644
--- a/config/metrics/counts_28d/count_total_delete_group_wiki_page_monthly.yml
+++ b/config/metrics/counts_28d/count_total_delete_group_wiki_page_monthly.yml
@@ -10,8 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167091
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ee
 tiers:
 - premium
 - ultimate
diff --git a/config/metrics/counts_28d/count_total_expand_description_on_workitem_monthly.yml b/config/metrics/counts_28d/count_total_expand_description_on_workitem_monthly.yml
index 81ed49f21a6..77f97bfa7ba 100644
--- a/config/metrics/counts_28d/count_total_expand_description_on_workitem_monthly.yml
+++ b/config/metrics/counts_28d/count_total_expand_description_on_workitem_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/163372
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_i_quickactions_add_email_multiple_monthly.yml b/config/metrics/counts_28d/count_total_i_quickactions_add_email_multiple_monthly.yml
index 127606b5e3b..5dd02eecbe8 100644
--- a/config/metrics/counts_28d/count_total_i_quickactions_add_email_multiple_monthly.yml
+++ b/config/metrics/counts_28d/count_total_i_quickactions_add_email_multiple_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151776
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_i_quickactions_add_email_single_monthly.yml b/config/metrics/counts_28d/count_total_i_quickactions_add_email_single_monthly.yml
index c9f24e93cae..bb35eacf138 100644
--- a/config/metrics/counts_28d/count_total_i_quickactions_add_email_single_monthly.yml
+++ b/config/metrics/counts_28d/count_total_i_quickactions_add_email_single_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151776
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_i_quickactions_convert_to_ticket_monthly.yml b/config/metrics/counts_28d/count_total_i_quickactions_convert_to_ticket_monthly.yml
index b0fdefc96ae..e3fa651614b 100644
--- a/config/metrics/counts_28d/count_total_i_quickactions_convert_to_ticket_monthly.yml
+++ b/config/metrics/counts_28d/count_total_i_quickactions_convert_to_ticket_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139553
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_merge_request_click_add_to_review_on_changes_tab_monthly.yml b/config/metrics/counts_28d/count_total_merge_request_click_add_to_review_on_changes_tab_monthly.yml
index 47a63c4cf7c..14693ed03dc 100644
--- a/config/metrics/counts_28d/count_total_merge_request_click_add_to_review_on_changes_tab_monthly.yml
+++ b/config/metrics/counts_28d/count_total_merge_request_click_add_to_review_on_changes_tab_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141911
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_merge_request_click_add_to_review_on_overview_tab_monthly.yml b/config/metrics/counts_28d/count_total_merge_request_click_add_to_review_on_overview_tab_monthly.yml
index f72fc98541b..3e9b610644c 100644
--- a/config/metrics/counts_28d/count_total_merge_request_click_add_to_review_on_overview_tab_monthly.yml
+++ b/config/metrics/counts_28d/count_total_merge_request_click_add_to_review_on_overview_tab_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141911
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_merge_request_click_start_review_on_changes_tab_monthly.yml b/config/metrics/counts_28d/count_total_merge_request_click_start_review_on_changes_tab_monthly.yml
index dcb67744607..b5fd0010ab3 100644
--- a/config/metrics/counts_28d/count_total_merge_request_click_start_review_on_changes_tab_monthly.yml
+++ b/config/metrics/counts_28d/count_total_merge_request_click_start_review_on_changes_tab_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141911
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_merge_request_click_start_review_on_overview_tab_monthly.yml b/config/metrics/counts_28d/count_total_merge_request_click_start_review_on_overview_tab_monthly.yml
index 663d1d77912..8945f738fd9 100644
--- a/config/metrics/counts_28d/count_total_merge_request_click_start_review_on_overview_tab_monthly.yml
+++ b/config/metrics/counts_28d/count_total_merge_request_click_start_review_on_overview_tab_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141911
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_model_registry_ml_model_created_28d.yml b/config/metrics/counts_28d/count_total_model_registry_ml_model_created_28d.yml
index c1347de8add..1793834a684 100644
--- a/config/metrics/counts_28d/count_total_model_registry_ml_model_created_28d.yml
+++ b/config/metrics/counts_28d/count_total_model_registry_ml_model_created_28d.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139798
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_model_registry_ml_model_version_created_28d.yml b/config/metrics/counts_28d/count_total_model_registry_ml_model_version_created_28d.yml
index c90c48ad93d..9881daee435 100644
--- a/config/metrics/counts_28d/count_total_model_registry_ml_model_version_created_28d.yml
+++ b/config/metrics/counts_28d/count_total_model_registry_ml_model_version_created_28d.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139798
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_package_ml_model_pulled_monthly.yml b/config/metrics/counts_28d/count_total_package_ml_model_pulled_monthly.yml
index 39839c784ab..032c462ad13 100644
--- a/config/metrics/counts_28d/count_total_package_ml_model_pulled_monthly.yml
+++ b/config/metrics/counts_28d/count_total_package_ml_model_pulled_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151919
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_package_ml_model_pushed_monthly.yml b/config/metrics/counts_28d/count_total_package_ml_model_pushed_monthly.yml
index 33c35274317..1ccc3f53494 100644
--- a/config/metrics/counts_28d/count_total_package_ml_model_pushed_monthly.yml
+++ b/config/metrics/counts_28d/count_total_package_ml_model_pushed_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167298
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_push_package_to_registry_conan_monthly.yml b/config/metrics/counts_28d/count_total_push_package_to_registry_conan_monthly.yml
index 43990c4e6e2..f05f9684217 100644
--- a/config/metrics/counts_28d/count_total_push_package_to_registry_conan_monthly.yml
+++ b/config/metrics/counts_28d/count_total_push_package_to_registry_conan_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165189
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_push_package_to_registry_generic_monthly.yml b/config/metrics/counts_28d/count_total_push_package_to_registry_generic_monthly.yml
index 4a6e211c1c4..75eb994dced 100644
--- a/config/metrics/counts_28d/count_total_push_package_to_registry_generic_monthly.yml
+++ b/config/metrics/counts_28d/count_total_push_package_to_registry_generic_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165189
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_push_package_to_registry_golang_monthly.yml b/config/metrics/counts_28d/count_total_push_package_to_registry_golang_monthly.yml
index adae7e4d34e..394b8e65886 100644
--- a/config/metrics/counts_28d/count_total_push_package_to_registry_golang_monthly.yml
+++ b/config/metrics/counts_28d/count_total_push_package_to_registry_golang_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165189
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_push_package_to_registry_helm_monthly.yml b/config/metrics/counts_28d/count_total_push_package_to_registry_helm_monthly.yml
index 0c2605b97d2..50799bcbf1f 100644
--- a/config/metrics/counts_28d/count_total_push_package_to_registry_helm_monthly.yml
+++ b/config/metrics/counts_28d/count_total_push_package_to_registry_helm_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165189
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_push_package_to_registry_maven_monthly.yml b/config/metrics/counts_28d/count_total_push_package_to_registry_maven_monthly.yml
index 320a5c09a36..18559f926b0 100644
--- a/config/metrics/counts_28d/count_total_push_package_to_registry_maven_monthly.yml
+++ b/config/metrics/counts_28d/count_total_push_package_to_registry_maven_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165189
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_push_package_to_registry_monthly.yml b/config/metrics/counts_28d/count_total_push_package_to_registry_monthly.yml
index c4bf698a864..d2581c1ca5a 100644
--- a/config/metrics/counts_28d/count_total_push_package_to_registry_monthly.yml
+++ b/config/metrics/counts_28d/count_total_push_package_to_registry_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165189
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_push_package_to_registry_npm_monthly.yml b/config/metrics/counts_28d/count_total_push_package_to_registry_npm_monthly.yml
index 5266956811c..d6d4253bfc4 100644
--- a/config/metrics/counts_28d/count_total_push_package_to_registry_npm_monthly.yml
+++ b/config/metrics/counts_28d/count_total_push_package_to_registry_npm_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165189
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_push_package_to_registry_nuget_monthly.yml b/config/metrics/counts_28d/count_total_push_package_to_registry_nuget_monthly.yml
index 51bd17f18b1..0576495acdd 100644
--- a/config/metrics/counts_28d/count_total_push_package_to_registry_nuget_monthly.yml
+++ b/config/metrics/counts_28d/count_total_push_package_to_registry_nuget_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165189
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_push_package_to_registry_pypi_monthly.yml b/config/metrics/counts_28d/count_total_push_package_to_registry_pypi_monthly.yml
index 98a03ffec76..2e6ce129388 100644
--- a/config/metrics/counts_28d/count_total_push_package_to_registry_pypi_monthly.yml
+++ b/config/metrics/counts_28d/count_total_push_package_to_registry_pypi_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165189
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_push_package_to_registry_rpm_monthly.yml b/config/metrics/counts_28d/count_total_push_package_to_registry_rpm_monthly.yml
index 62685cb691d..e4f01260775 100644
--- a/config/metrics/counts_28d/count_total_push_package_to_registry_rpm_monthly.yml
+++ b/config/metrics/counts_28d/count_total_push_package_to_registry_rpm_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165189
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_push_package_to_registry_rubygems_monthly.yml b/config/metrics/counts_28d/count_total_push_package_to_registry_rubygems_monthly.yml
index e39b900b129..417c63254f4 100644
--- a/config/metrics/counts_28d/count_total_push_package_to_registry_rubygems_monthly.yml
+++ b/config/metrics/counts_28d/count_total_push_package_to_registry_rubygems_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165189
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_push_package_to_registry_terraform_module_monthly.yml b/config/metrics/counts_28d/count_total_push_package_to_registry_terraform_module_monthly.yml
index 0b4e4e1ac38..9ea0c1a3b31 100644
--- a/config/metrics/counts_28d/count_total_push_package_to_registry_terraform_module_monthly.yml
+++ b/config/metrics/counts_28d/count_total_push_package_to_registry_terraform_module_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165189
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_register_agent_at_kas_monthly.yml b/config/metrics/counts_28d/count_total_register_agent_at_kas_monthly.yml
index 9a8de142a00..7a0d17288e0 100644
--- a/config/metrics/counts_28d/count_total_register_agent_at_kas_monthly.yml
+++ b/config/metrics/counts_28d/count_total_register_agent_at_kas_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154883
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_request_service_ping_via_rest_monthly.yml b/config/metrics/counts_28d/count_total_request_service_ping_via_rest_monthly.yml
index 7b812a0c83c..075c49531aa 100644
--- a/config/metrics/counts_28d/count_total_request_service_ping_via_rest_monthly.yml
+++ b/config/metrics/counts_28d/count_total_request_service_ping_via_rest_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143385/
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_resource_kind_from_open_kubernetes_resource_details_monthly.yml b/config/metrics/counts_28d/count_total_resource_kind_from_open_kubernetes_resource_details_monthly.yml
index 509c8480e5c..fed152eef63 100644
--- a/config/metrics/counts_28d/count_total_resource_kind_from_open_kubernetes_resource_details_monthly.yml
+++ b/config/metrics/counts_28d/count_total_resource_kind_from_open_kubernetes_resource_details_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165366
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_runner_created_with_maintenance_note_monthly.yml b/config/metrics/counts_28d/count_total_runner_created_with_maintenance_note_monthly.yml
index cfc86543a7a..e689a13f501 100644
--- a/config/metrics/counts_28d/count_total_runner_created_with_maintenance_note_monthly.yml
+++ b/config/metrics/counts_28d/count_total_runner_created_with_maintenance_note_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170483
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_update_group_wiki_page_monthly.yml b/config/metrics/counts_28d/count_total_update_group_wiki_page_monthly.yml
index 49d091c09ec..058239b34f9 100644
--- a/config/metrics/counts_28d/count_total_update_group_wiki_page_monthly.yml
+++ b/config/metrics/counts_28d/count_total_update_group_wiki_page_monthly.yml
@@ -10,8 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167091
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ee
 tiers:
 - premium
 - ultimate
diff --git a/config/metrics/counts_28d/count_total_use_run_keyword_in_cicd_yaml_monthly.yml b/config/metrics/counts_28d/count_total_use_run_keyword_in_cicd_yaml_monthly.yml
index 5f6b4ef7793..50b24123890 100644
--- a/config/metrics/counts_28d/count_total_use_run_keyword_in_cicd_yaml_monthly.yml
+++ b/config/metrics/counts_28d/count_total_use_run_keyword_in_cicd_yaml_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169408
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_user_clicks_comment_filter_dropdown_monthly.yml b/config/metrics/counts_28d/count_total_user_clicks_comment_filter_dropdown_monthly.yml
index 7a463d3332b..350ca1ec0a4 100644
--- a/config/metrics/counts_28d/count_total_user_clicks_comment_filter_dropdown_monthly.yml
+++ b/config/metrics/counts_28d/count_total_user_clicks_comment_filter_dropdown_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/145998
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_abuse_reports_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_abuse_reports_pageload_monthly.yml
index eef73647476..dde230839c7 100644
--- a/config/metrics/counts_28d/count_total_view_admin_abuse_reports_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_abuse_reports_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157477
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_application_settings_advanced_search_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_application_settings_advanced_search_pageload_monthly.yml
index c85a9f9c1b6..b874d191a6e 100644
--- a/config/metrics/counts_28d/count_total_view_admin_application_settings_advanced_search_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_application_settings_advanced_search_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158122
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_application_settings_analytics_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_application_settings_analytics_pageload_monthly.yml
index bdc5a5ac230..b04e33ee1ff 100644
--- a/config/metrics/counts_28d/count_total_view_admin_application_settings_analytics_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_application_settings_analytics_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158263
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_application_settings_appearance_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_application_settings_appearance_pageload_monthly.yml
index fade2356acf..c37972d8909 100644
--- a/config/metrics/counts_28d/count_total_view_admin_application_settings_appearance_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_application_settings_appearance_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158261
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_application_settings_ci_cd_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_application_settings_ci_cd_pageload_monthly.yml
index 32d6bf818db..0aba450c3d1 100644
--- a/config/metrics/counts_28d/count_total_view_admin_application_settings_ci_cd_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_application_settings_ci_cd_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158131
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_application_settings_general_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_application_settings_general_pageload_monthly.yml
index b3036f040cd..1b4fce0f584 100644
--- a/config/metrics/counts_28d/count_total_view_admin_application_settings_general_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_application_settings_general_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158118
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_application_settings_integrations_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_application_settings_integrations_pageload_monthly.yml
index 3f01185659f..de12350c393 100644
--- a/config/metrics/counts_28d/count_total_view_admin_application_settings_integrations_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_application_settings_integrations_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158128
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_application_settings_metrics_and_profiling_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_application_settings_metrics_and_profiling_pageload_monthly.yml
index 4458138ebaf..b4dc884111c 100644
--- a/config/metrics/counts_28d/count_total_view_admin_application_settings_metrics_and_profiling_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_application_settings_metrics_and_profiling_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158234
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_application_settings_network_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_application_settings_network_pageload_monthly.yml
index 767362c01d6..45e7e0e4780 100644
--- a/config/metrics/counts_28d/count_total_view_admin_application_settings_network_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_application_settings_network_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158235
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_application_settings_preferences_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_application_settings_preferences_pageload_monthly.yml
index f88818a8d3e..064efb9255c 100644
--- a/config/metrics/counts_28d/count_total_view_admin_application_settings_preferences_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_application_settings_preferences_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158262
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_application_settings_reporting_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_application_settings_reporting_pageload_monthly.yml
index 549deb33f0a..ded9618d7bf 100644
--- a/config/metrics/counts_28d/count_total_view_admin_application_settings_reporting_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_application_settings_reporting_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158230
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_application_settings_repository_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_application_settings_repository_pageload_monthly.yml
index c3c8abc9b74..f64b5fd8e16 100644
--- a/config/metrics/counts_28d/count_total_view_admin_application_settings_repository_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_application_settings_repository_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158130
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_application_settings_roles_and_permissions_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_application_settings_roles_and_permissions_pageload_monthly.yml
index 75870324794..586b596edf5 100644
--- a/config/metrics/counts_28d/count_total_view_admin_application_settings_roles_and_permissions_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_application_settings_roles_and_permissions_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158120
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_application_settings_security_and_compliance_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_application_settings_security_and_compliance_pageload_monthly.yml
index bc59a5e727b..46609929b70 100644
--- a/config/metrics/counts_28d/count_total_view_admin_application_settings_security_and_compliance_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_application_settings_security_and_compliance_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158225
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_application_settings_templates_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_application_settings_templates_pageload_monthly.yml
index 5968d9f20a2..9b655d59697 100644
--- a/config/metrics/counts_28d/count_total_view_admin_application_settings_templates_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_application_settings_templates_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158231
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_applications_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_applications_pageload_monthly.yml
index febe4f7200e..3a7cb83c477 100644
--- a/config/metrics/counts_28d/count_total_view_admin_applications_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_applications_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157473
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_audit_logs_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_audit_logs_pageload_monthly.yml
index 15901551337..14ea2c01823 100644
--- a/config/metrics/counts_28d/count_total_view_admin_audit_logs_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_audit_logs_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156830
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_background_jobs_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_background_jobs_pageload_monthly.yml
index ecda9cc3155..75c1381349d 100644
--- a/config/metrics/counts_28d/count_total_view_admin_background_jobs_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_background_jobs_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156827
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_background_migrations_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_background_migrations_pageload_monthly.yml
index 46f0a1e5cb2..b5c4b17e87c 100644
--- a/config/metrics/counts_28d/count_total_view_admin_background_migrations_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_background_migrations_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156826
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_broadcast_messages_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_broadcast_messages_pageload_monthly.yml
index 65c537fed92..3832f4cfcb9 100644
--- a/config/metrics/counts_28d/count_total_view_admin_broadcast_messages_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_broadcast_messages_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157466
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_credentials_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_credentials_pageload_monthly.yml
index 855e1ab9b49..fdfcde6ff56 100644
--- a/config/metrics/counts_28d/count_total_view_admin_credentials_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_credentials_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157522
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_dashboard_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_dashboard_pageload_monthly.yml
index 70da500ade8..e97e79c119d 100644
--- a/config/metrics/counts_28d/count_total_view_admin_dashboard_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_dashboard_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156645
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_deploy_keys_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_deploy_keys_pageload_monthly.yml
index e24ab9e2d44..22dfcac3f26 100644
--- a/config/metrics/counts_28d/count_total_view_admin_deploy_keys_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_deploy_keys_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157520
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_dev_ops_reports_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_dev_ops_reports_pageload_monthly.yml
index 33b3d6a2aae..ddf9abcb492 100644
--- a/config/metrics/counts_28d/count_total_view_admin_dev_ops_reports_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_dev_ops_reports_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156816
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_geo_settings_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_geo_settings_pageload_monthly.yml
index 71585091d70..5cb4094df6f 100644
--- a/config/metrics/counts_28d/count_total_view_admin_geo_settings_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_geo_settings_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157498
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - premium
 - ultimate
diff --git a/config/metrics/counts_28d/count_total_view_admin_geo_sites_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_geo_sites_pageload_monthly.yml
index 7146e90c9ad..c854ea977a4 100644
--- a/config/metrics/counts_28d/count_total_view_admin_geo_sites_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_geo_sites_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157497
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_gitaly_servers_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_gitaly_servers_pageload_monthly.yml
index a76953cf5a4..6359c57279b 100644
--- a/config/metrics/counts_28d/count_total_view_admin_gitaly_servers_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_gitaly_servers_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156811
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_groups_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_groups_pageload_monthly.yml
index efe01ba84f9..75ed8acbf39 100644
--- a/config/metrics/counts_28d/count_total_view_admin_groups_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_groups_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156807
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_health_check_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_health_check_pageload_monthly.yml
index a8b54837976..8308cfbbeb0 100644
--- a/config/metrics/counts_28d/count_total_view_admin_health_check_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_health_check_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156829
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_hooks_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_hooks_pageload_monthly.yml
index 0e0bd2367ae..c388b257821 100644
--- a/config/metrics/counts_28d/count_total_view_admin_hooks_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_hooks_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157469
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_jobs_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_jobs_pageload_monthly.yml
index 3707cff663f..b459577c1c4 100644
--- a/config/metrics/counts_28d/count_total_view_admin_jobs_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_jobs_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156814
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_labels_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_labels_pageload_monthly.yml
index 125833da332..1d697ee232c 100644
--- a/config/metrics/counts_28d/count_total_view_admin_labels_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_labels_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157524
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_projects_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_projects_pageload_monthly.yml
index 066834a456f..80453e2fca7 100644
--- a/config/metrics/counts_28d/count_total_view_admin_projects_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_projects_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156805
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_push_rule_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_push_rule_pageload_monthly.yml
index cf0a873f5d6..217e5527124 100644
--- a/config/metrics/counts_28d/count_total_view_admin_push_rule_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_push_rule_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157494
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_runners_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_runners_pageload_monthly.yml
index ec6f59bbb26..7602e52a2d7 100644
--- a/config/metrics/counts_28d/count_total_view_admin_runners_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_runners_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156812
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_subscription_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_subscription_pageload_monthly.yml
index 347c07a68a4..08b58a87d61 100644
--- a/config/metrics/counts_28d/count_total_view_admin_subscription_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_subscription_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157478
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_system_info_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_system_info_pageload_monthly.yml
index 3cc0ab07e52..4d5a7465ca7 100644
--- a/config/metrics/counts_28d/count_total_view_admin_system_info_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_system_info_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156825
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_topics_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_topics_pageload_monthly.yml
index 20e76fcebe3..54dd5d11aa2 100644
--- a/config/metrics/counts_28d/count_total_view_admin_topics_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_topics_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156810
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_usage_trends_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_usage_trends_pageload_monthly.yml
index 7619618d9cc..8f4180041e9 100644
--- a/config/metrics/counts_28d/count_total_view_admin_usage_trends_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_usage_trends_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156817
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_28d/count_total_view_admin_users_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_users_pageload_monthly.yml
index 888fd8821d8..686853cf3c3 100644
--- a/config/metrics/counts_28d/count_total_view_admin_users_pageload_monthly.yml
+++ b/config/metrics/counts_28d/count_total_view_admin_users_pageload_monthly.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156806
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 92be1f1742a..da8634346bd 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -541,6 +541,8 @@
   - 1
 - - merge_request_reset_approvals
   - 1
+- - merge_requests_approval_metrics_event
+  - 1
 - - merge_requests_capture_suggested_reviewers_accepted
   - 1
 - - merge_requests_cleanup_ref
diff --git a/db/docs/merge_request_approval_metrics.yml b/db/docs/merge_request_approval_metrics.yml
new file mode 100644
index 00000000000..d22bd3b9441
--- /dev/null
+++ b/db/docs/merge_request_approval_metrics.yml
@@ -0,0 +1,14 @@
+---
+table_name: merge_request_approval_metrics
+classes:
+- MergeRequest::ApprovalMetrics
+feature_categories:
+- code_review_workflow
+description: Stores approval metrics for merge requests, including the last approval
+  timestamp
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/175989#note_2265557609
+milestone: '17.9'
+gitlab_schema: gitlab_main_cell
+sharding_key:
+  target_project_id: projects
+table_size: small
diff --git a/db/migrate/20241217100247_create_merge_request_approval_metrics.rb b/db/migrate/20241217100247_create_merge_request_approval_metrics.rb
new file mode 100644
index 00000000000..4e33d104860
--- /dev/null
+++ b/db/migrate/20241217100247_create_merge_request_approval_metrics.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class CreateMergeRequestApprovalMetrics < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+
+  def up
+    create_table :merge_request_approval_metrics, id: false do |t|
+      t.references :merge_request, primary_key: true, index: true,
+        foreign_key: { on_delete: :cascade }
+      t.datetime_with_timezone :last_approved_at, null: false
+      t.bigint :target_project_id, null: false
+      t.index [:target_project_id, :merge_request_id], unique: true,
+        name: :index_mr_approval_metrics_on_project_id_and_mr_id
+    end
+
+    execute 'DROP SEQUENCE IF EXISTS merge_request_approval_metrics_merge_request_id_seq CASCADE'
+  end
+
+  def down
+    drop_table :merge_request_approval_metrics
+  end
+end
diff --git a/db/migrate/20250114084738_add_target_project_foreign_key_to_merge_request_approval_metrics.rb b/db/migrate/20250114084738_add_target_project_foreign_key_to_merge_request_approval_metrics.rb
new file mode 100644
index 00000000000..aa3ac5f96d0
--- /dev/null
+++ b/db/migrate/20250114084738_add_target_project_foreign_key_to_merge_request_approval_metrics.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddTargetProjectForeignKeyToMergeRequestApprovalMetrics < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :merge_request_approval_metrics, :projects, column: :target_project_id,
+      on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key_if_exists :merge_request_approval_metrics, :projects, column: :target_project_id,
+        on_delete: :cascade
+    end
+  end
+end
diff --git a/db/schema_migrations/20241217100247 b/db/schema_migrations/20241217100247
new file mode 100644
index 00000000000..fe2f8af1faf
--- /dev/null
+++ b/db/schema_migrations/20241217100247
@@ -0,0 +1 @@
+f8863e96db7165d772bdcf5674e7481bc8a4ae4a440fd8c8050c8e442b6320ad
\ No newline at end of file
diff --git a/db/schema_migrations/20250114084738 b/db/schema_migrations/20250114084738
new file mode 100644
index 00000000000..773f0ba458b
--- /dev/null
+++ b/db/schema_migrations/20250114084738
@@ -0,0 +1 @@
+732a353bad77ecf6f5c990ecc07076139f7b33fb44c0b3ded181bf3e2002b734
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index f0e6603a595..b967140cd68 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -15324,6 +15324,12 @@ CREATE SEQUENCE members_id_seq
 
 ALTER SEQUENCE members_id_seq OWNED BY members.id;
 
+CREATE TABLE merge_request_approval_metrics (
+    merge_request_id bigint NOT NULL,
+    last_approved_at timestamp with time zone NOT NULL,
+    target_project_id bigint NOT NULL
+);
+
 CREATE TABLE merge_request_assignees (
     id bigint NOT NULL,
     user_id bigint NOT NULL,
@@ -27222,6 +27228,9 @@ ALTER TABLE ONLY members_deletion_schedules
 ALTER TABLE ONLY members
     ADD CONSTRAINT members_pkey PRIMARY KEY (id);
 
+ALTER TABLE ONLY merge_request_approval_metrics
+    ADD CONSTRAINT merge_request_approval_metrics_pkey PRIMARY KEY (merge_request_id);
+
 ALTER TABLE ONLY merge_request_assignees
     ADD CONSTRAINT merge_request_assignees_pkey PRIMARY KEY (id);
 
@@ -32473,6 +32482,8 @@ CREATE INDEX index_members_on_user_id_and_access_level_requested_at_is_null ON m
 
 CREATE INDEX index_members_on_user_id_created_at ON members USING btree (user_id, created_at) WHERE ((ldap = true) AND ((type)::text = 'GroupMember'::text) AND ((source_type)::text = 'Namespace'::text));
 
+CREATE INDEX index_merge_request_approval_metrics_on_merge_request_id ON merge_request_approval_metrics USING btree (merge_request_id);
+
 CREATE UNIQUE INDEX index_merge_request_assignees_on_merge_request_id_and_user_id ON merge_request_assignees USING btree (merge_request_id, user_id);
 
 CREATE INDEX index_merge_request_assignees_on_project_id ON merge_request_assignees USING btree (project_id);
@@ -32711,6 +32722,8 @@ CREATE UNIQUE INDEX index_ml_models_on_project_id_and_name ON ml_models USING bt
 
 CREATE INDEX index_ml_models_on_user_id ON ml_models USING btree (user_id);
 
+CREATE UNIQUE INDEX index_mr_approval_metrics_on_project_id_and_mr_id ON merge_request_approval_metrics USING btree (target_project_id, merge_request_id);
+
 CREATE UNIQUE INDEX index_mr_blocks_on_blocking_and_blocked_mr_ids ON merge_request_blocks USING btree (blocking_merge_request_id, blocked_merge_request_id);
 
 CREATE INDEX index_mr_cleanup_schedules_timestamps_status ON merge_request_cleanup_schedules USING btree (scheduled_at) WHERE ((completed_at IS NULL) AND (status = 0));
@@ -37748,6 +37761,9 @@ ALTER TABLE ONLY approvals
 ALTER TABLE ONLY namespaces
     ADD CONSTRAINT fk_319256d87a FOREIGN KEY (file_template_project_id) REFERENCES projects(id) ON DELETE SET NULL;
 
+ALTER TABLE ONLY merge_request_approval_metrics
+    ADD CONSTRAINT fk_324639fb86 FOREIGN KEY (target_project_id) REFERENCES projects(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY protected_branch_unprotect_access_levels
     ADD CONSTRAINT fk_325cad614b FOREIGN KEY (protected_branch_project_id) REFERENCES projects(id) ON DELETE CASCADE;
 
@@ -39902,6 +39918,9 @@ ALTER TABLE ONLY reviews
 ALTER TABLE ONLY ci_running_builds
     ADD CONSTRAINT fk_rails_5ca491d360 FOREIGN KEY (runner_id) REFERENCES ci_runners(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY merge_request_approval_metrics
+    ADD CONSTRAINT fk_rails_5cb1ca73f8 FOREIGN KEY (merge_request_id) REFERENCES merge_requests(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY ci_stages
     ADD CONSTRAINT fk_rails_5d4d96d44b_p FOREIGN KEY (partition_id, pipeline_id) REFERENCES p_ci_pipelines(partition_id, id) ON UPDATE CASCADE ON DELETE CASCADE NOT VALID;
 
diff --git a/doc/administration/admin_area.md b/doc/administration/admin_area.md
index 0dc3e1f99c4..1c4736f746c 100644
--- a/doc/administration/admin_area.md
+++ b/doc/administration/admin_area.md
@@ -504,7 +504,7 @@ The **Audit events** page lists changes made within the GitLab server. With this
 
 ### Statistics
 
-The **Instance overview** section of the Dashboard lists the current statistics of the GitLab instance. This information is retrieved using the [Application statistics API](../api/statistics.md#get-current-application-statistics).
+The **Instance overview** section of the Dashboard lists the current statistics of the GitLab instance. This information is retrieved using the [Application statistics API](../api/statistics.md#get-details-on-current-application-statistics).
 
 NOTE:
 These statistics show exact counts for values less than 10,000. For values of 10,000 and higher, these statistics show approximate data
diff --git a/doc/administration/instance_limits.md b/doc/administration/instance_limits.md
index 4b7d95c5abf..217db1d5da6 100644
--- a/doc/administration/instance_limits.md
+++ b/doc/administration/instance_limits.md
@@ -795,7 +795,7 @@ For new GitLab Self-Managed instances, the default is `157286400` bytes (150 MB)
 
 For existing instances that upgrade to GitLab 16.3 or later, the default is calculated
 by multiplying [`max_yaml_size_bytes` (default 1 MB)](#maximum-size-and-depth-of-cicd-configuration-yaml-files)
-with [`ci_max_includes` (default 150)](../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls).
+with [`ci_max_includes` (default 150)](../api/settings.md#available-settings).
 If both limits are unmodified, the default is set to 1 MB x 150 = `157286400` bytes (150 MB).
 
 You can change this limit by using the [GitLab Rails console](operations/rails_console.md#starting-a-rails-console-session).
diff --git a/doc/administration/invalidate_markdown_cache.md b/doc/administration/invalidate_markdown_cache.md
index 21e19192bab..176002226b0 100644
--- a/doc/administration/invalidate_markdown_cache.md
+++ b/doc/administration/invalidate_markdown_cache.md
@@ -26,7 +26,7 @@ Pre-requisite:
 - You must be an administrator.
 
 To avoid problems caused by cached HTML versions, invalidate the existing cache by increasing the `local_markdown_version`
-setting in application settings [using the API](../api/settings.md#change-application-settings):
+setting in application settings [using the API](../api/settings.md#update-application-settings):
 
 ```shell
 curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/application/settings?local_markdown_version=<increased_number>"
diff --git a/doc/administration/review_abuse_reports.md b/doc/administration/review_abuse_reports.md
index 7d84b9f0d57..59293b6427a 100644
--- a/doc/administration/review_abuse_reports.md
+++ b/doc/administration/review_abuse_reports.md
@@ -25,7 +25,7 @@ To receive notifications of new abuse reports by email:
 1. Provide an email address and select **Save changes**.
 
 The notification email address can also be set and retrieved
-[using the API](../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls).
+[using the API](../api/settings.md#available-settings).
 
 ## Reporting abuse
 
diff --git a/doc/administration/settings/account_and_limit_settings.md b/doc/administration/settings/account_and_limit_settings.md
index 8653ca82fc7..db786dc5326 100644
--- a/doc/administration/settings/account_and_limit_settings.md
+++ b/doc/administration/settings/account_and_limit_settings.md
@@ -442,7 +442,7 @@ By default, new users can create top-level groups. GitLab administrators can pre
 
 - In GitLab 15.5 and later, use either:
   - The GitLab UI with the steps in this section.
-  - The [Application settings API](../../api/settings.md#change-application-settings).
+  - The [Application settings API](../../api/settings.md#update-application-settings).
 - In GitLab 15.4 and earlier, modify a [configuration file](../../administration/user_settings.md#prevent-users-from-creating-top-level-groups).
 
 1. On the left sidebar, at the bottom, select **Admin**.
@@ -471,6 +471,7 @@ DETAILS:
 **Status:** Experiment
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/421310) in GitLab 17.1 [with a flag](../../administration/feature_flags.md) named `disallow_private_profiles`. Disabled by default.
+> - [Generally Available](https://gitlab.com/gitlab-org/gitlab/-/issues/427400) in GitLab 17.9. Feature flag `disallow_private_profiles` removed.
 
 FLAG:
 The availability of this feature is controlled by a feature flag.
diff --git a/doc/administration/settings/import_and_export_settings.md b/doc/administration/settings/import_and_export_settings.md
index 3a515671fae..c70f2c7d214 100644
--- a/doc/administration/settings/import_and_export_settings.md
+++ b/doc/administration/settings/import_and_export_settings.md
@@ -63,7 +63,7 @@ To enable migration of groups and projects by direct transfer:
 1. Select **Save changes**.
 
 The same setting
-[is available](../../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls) in the API as the
+[is available](../../api/settings.md#available-settings) in the API as the
 `bulk_import_enabled` attribute.
 
 ## Enable silent admin exports
diff --git a/doc/administration/settings/push_event_activities_limit.md b/doc/administration/settings/push_event_activities_limit.md
index e5ca057ebe3..45bcabe5b7b 100644
--- a/doc/administration/settings/push_event_activities_limit.md
+++ b/doc/administration/settings/push_event_activities_limit.md
@@ -32,7 +32,7 @@ To modify this setting:
   1. Select **Settings > Network**.
   1. Expand **Performance optimization**.
   1. Edit the **Push event activities limit** setting.
-- Through the [Application settings API](../../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls)
+- Through the [Application settings API](../../api/settings.md#available-settings)
   as `push_event_activities_limit`.
 
 The default value is `3`, but the value can be greater than or equal to `0`. Setting this value to `0` does not disable throttling.
diff --git a/doc/administration/settings/security_contact_information.md b/doc/administration/settings/security_contact_information.md
index 06dea0f6011..43315b09cd6 100644
--- a/doc/administration/settings/security_contact_information.md
+++ b/doc/administration/settings/security_contact_information.md
@@ -17,7 +17,7 @@ providing public contact information. GitLab supports using a
 [`security.txt`](https://securitytxt.org/) file for this purpose.
 
 Administrators can add a `security.txt` file using the GitLab UI or the
-[REST API](../../api/settings.md#change-application-settings).
+[REST API](../../api/settings.md#update-application-settings).
 Any content added is made available at
 `https://gitlab.example.com/.well-known/security.txt`. Authentication is not
 required to view this file.
diff --git a/doc/administration/settings/sign_in_restrictions.md b/doc/administration/settings/sign_in_restrictions.md
index 58cfa6a2a84..dbb8fbd906a 100644
--- a/doc/administration/settings/sign_in_restrictions.md
+++ b/doc/administration/settings/sign_in_restrictions.md
@@ -30,7 +30,7 @@ You can restrict the password authentication for web interface and Git over HTTP
 - **Git over HTTP(S)**: When this feature is disabled, a [personal access token](../../user/profile/personal_access_tokens.md)
   or LDAP password must be used to authenticate.
 
-In the event of an external authentication provider outage, use the [GitLab Rails console](../operations/rails_console.md) to [re-enable the standard web sign-in form](#re-enable-standard-web-sign-in-form-in-rails-console). This configuration can also be changed over the [Application settings REST API](../../api/settings.md#change-application-settings) while authenticating with an administrator account's personal access token.
+In the event of an external authentication provider outage, use the [GitLab Rails console](../operations/rails_console.md) to [re-enable the standard web sign-in form](#re-enable-standard-web-sign-in-form-in-rails-console). This configuration can also be changed over the [Application settings REST API](../../api/settings.md#update-application-settings) while authenticating with an administrator account's personal access token.
 
 ### Disable password authentication for users with an SSO identity
 
diff --git a/doc/administration/snippets/index.md b/doc/administration/snippets/index.md
index 1b1de9cadbc..339e045c559 100644
--- a/doc/administration/snippets/index.md
+++ b/doc/administration/snippets/index.md
@@ -46,7 +46,7 @@ To retrieve the current value, start the Rails console and run:
 ### Use the API
 
 To set the limit by using the Application Settings API
-(similar to [updating any other setting](../../api/settings.md#change-application-settings)),
+(similar to [updating any other setting](../../api/settings.md#update-application-settings)),
 use this command:
 
 ```shell
@@ -55,7 +55,7 @@ curl --request PUT \
   --url "https://gitlab.example.com/api/v4/application/settings?snippet_size_limit=52428800"
 ```
 
-You can also use the API to [retrieve the current value](../../api/settings.md#get-current-application-settings).
+You can also use the API to [retrieve the current value](../../api/settings.md#get-details-on-current-application-settings).
 
 ```shell
 curl --header "PRIVATE-TOKEN: <your_access_token>" \
diff --git a/doc/administration/user_settings.md b/doc/administration/user_settings.md
index 12613eda441..43c2f234ecc 100644
--- a/doc/administration/user_settings.md
+++ b/doc/administration/user_settings.md
@@ -26,7 +26,7 @@ To prevent new users from creating top-level groups:
 
 - In GitLab 15.5 and later, use either:
   - The [GitLab UI](../administration/settings/account_and_limit_settings.md#prevent-new-users-from-creating-top-level-groups).
-  - The [Application settings API](../api/settings.md#change-application-settings).
+  - The [Application settings API](../api/settings.md#update-application-settings).
 - In GitLab 15.4 and earlier, modify a configuration file:
 
 ::Tabs
diff --git a/doc/administration/wikis/index.md b/doc/administration/wikis/index.md
index 8594399b9f8..7194ba8b1bd 100644
--- a/doc/administration/wikis/index.md
+++ b/doc/administration/wikis/index.md
@@ -63,13 +63,13 @@ To retrieve the current value, start the Rails console and run:
 #### Through the API
 
 To set the wiki page size limit through the Application Settings API, use a command,
-as you would to [update any other setting](../../api/settings.md#change-application-settings):
+as you would to [update any other setting](../../api/settings.md#update-application-settings):
 
 ```shell
 curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/application/settings?wiki_page_max_content_bytes=52428800"
 ```
 
-You can also use the API to [retrieve the current value](../../api/settings.md#get-current-application-settings):
+You can also use the API to [retrieve the current value](../../api/settings.md#get-details-on-current-application-settings):
 
 ```shell
 curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/application/settings"
@@ -120,7 +120,7 @@ To check if includes are enabled, start the Rails console and run:
 ### Through the API
 
 To set the wiki to allow URI includes for AsciiDoc through the
-[Application Settings API](../../api/settings.md#change-application-settings),
+[Application Settings API](../../api/settings.md#update-application-settings),
 use a `curl` command:
 
 ```shell
diff --git a/doc/api/appearance.md b/doc/api/appearance.md
index fbd5c54c24d..c365fbff267 100644
--- a/doc/api/appearance.md
+++ b/doc/api/appearance.md
@@ -4,7 +4,7 @@ group: Authentication
 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
 ---
 
-# Appearance API
+# Application appearance API
 
 DETAILS:
 **Tier:** Free, Premium, Ultimate
@@ -16,9 +16,9 @@ Prerequisites:
 
 - You must have administrator access to the instance.
 
-## Get current appearance configuration
+## Get details on current application appearance
 
-List the current appearance configuration of the GitLab instance.
+Gets details on the current appearance configuration for this GitLab instance.
 
 ```plaintext
 GET /application/appearance
@@ -27,7 +27,9 @@ GET /application/appearance
 Example request:
 
 ```shell
-curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/application/appearance"
+curl --request GET \
+  --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/application/appearance"
 ```
 
 Example response:
@@ -54,9 +56,9 @@ Example response:
 }
 ```
 
-## Change appearance configuration
+## Update application appearance
 
-Use an API call to modify GitLab instance appearance configuration.
+Updates the current appearance configuration for this GitLab instance.
 
 ```plaintext
 PUT /application/appearance
@@ -69,8 +71,8 @@ PUT /application/appearance
 | `pwa_name`                        | string  | no       | Full name of the Progressive Web App. Used for the attribute `name` in `manifest.json`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/375708) in GitLab 15.8. |
 | `pwa_short_name`                  | string  | no       | Short name for Progressive Web App. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/375708) in GitLab 15.8. |
 | `pwa_description`                 | string  | no       | An explanation of what the Progressive Web App does. Used for the attribute `description` in `manifest.json`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/375708) in GitLab 15.8. |
-| `pwa_icon`                        | mixed   | no       | Icon used for Progressive Web App. See [Change logo](#change-logo). [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/375708) in GitLab 15.8. |
-| `logo`                            | mixed   | no       | Instance image used on the sign in / sign up page. See [Change logo](#change-logo) |
+| `pwa_icon`                        | mixed   | no       | Icon used for Progressive Web App. See [Update application logo](#update-application-logo). [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/375708) in GitLab 15.8. |
+| `logo`                            | mixed   | no       | Instance image used on the sign in / sign up page. See [Update application logo](#update-application-logo) |
 | `header_logo`                     | mixed   | no       | Instance image used for the main navigation bar |
 | `favicon`                         | mixed   | no       | Instance favicon in `.ico` or `.png` format |
 | `member_guidelines`               | string  | no       | Markdown text shown on the group or project member page for users with permission to change members |
@@ -85,7 +87,9 @@ PUT /application/appearance
 Example request:
 
 ```shell
-curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/application/appearance?email_header_and_footer_enabled=true&header_message=test"
+curl --request PUT \
+  --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/application/appearance?email_header_and_footer_enabled=true&header_message=test"
 ```
 
 Example response:
@@ -112,13 +116,13 @@ Example response:
 }
 ```
 
-## Change logo
+## Update application logo
 
-Upload a logo to your GitLab instance.
+Updates the current logo for this GitLab instance with an included image file.
 
-To upload an avatar from your file system, use the `--form` argument. This causes
-cURL to post data using the header `Content-Type: multipart/form-data`. The
-`file=` parameter must point to an image file on your file system and be
+To upload an avatar from your local file system, use the `--form` argument to include the file.
+This causes cURL to post data using the header `Content-Type: multipart/form-data`.
+The `file=` parameter must point to an image file on your file system and be
 preceded by `@`.
 
 ```plaintext
@@ -127,16 +131,17 @@ PUT /application/appearance
 
 | Attribute  | Type  | Required | Description |
 |------------|-------|----------|-------------|
-| `logo`     | mixed | Yes      | File to upload |
-| `pwa_icon` | mixed | Yes      | File to upload. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/375708) in GitLab 15.8. |
+| `logo`     | mixed | Yes      | Image used as a logo. |
+| `pwa_icon` | mixed | Yes      | Image used for the Progressive Web App. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/375708) in GitLab 15.8. |
 
 Example request:
 
 ```shell
-curl --location --request PUT "https://gitlab.example.com/api/v4/application/appearance?data=image/png" \
---header "Content-Type: multipart/form-data" \
---header "PRIVATE-TOKEN: <your_access_token>" \
---form "logo=@/path/to/logo.png"
+curl --location --request PUT \
+  --url "https://gitlab.example.com/api/v4/application/appearance?data=image/png" \
+  --header "PRIVATE-TOKEN: <your_access_token>" \
+  --header "Content-Type: multipart/form-data" \
+  --form "logo=@/path/to/logo.png"
 ```
 
 Example response:
diff --git a/doc/api/group_import_export.md b/doc/api/group_import_export.md
index f793df9d4bc..f9bd05dd9f5 100644
--- a/doc/api/group_import_export.md
+++ b/doc/api/group_import_export.md
@@ -98,7 +98,7 @@ The maximum import file size can be set by the Administrator on self-managed ins
 As an administrator, you can modify the maximum import file size either:
 
 - In the [**Admin** area](../administration/settings/import_and_export_settings.md).
-- By using the `max_import_size` option in the [Application settings API](settings.md#change-application-settings).
+- By using the `max_import_size` option in the [Application settings API](settings.md#update-application-settings).
 
 For information on the maximum import file size on GitLab.com, see
 [Account and limit settings](../user/gitlab_com/index.md#account-and-limit-settings).
diff --git a/doc/api/project_import_export.md b/doc/api/project_import_export.md
index 75a9664f58a..f2501446457 100644
--- a/doc/api/project_import_export.md
+++ b/doc/api/project_import_export.md
@@ -43,7 +43,7 @@ project to a web server or to any S3-compatible platform. For exports, GitLab:
 - Administrators can modify the maximum export file size. By default, the maximum is unlimited (`0`). To change this,
   edit `max_export_size` using either:
   - [GitLab UI](../administration/settings/import_and_export_settings.md).
-  - [Application settings API](settings.md#change-application-settings)
+  - [Application settings API](settings.md#update-application-settings)
 - Has a fixed limit for the maximum import file size on GitLab.com. For more information, see
   [Account and limit settings](../user/gitlab_com/index.md#account-and-limit-settings).
 
@@ -214,7 +214,7 @@ requests.post(url, headers=headers, data=data, files=files)
 
 NOTE:
 The maximum import file size can be set by the Administrator. It defaults to `0` (unlimited).
-As an administrator, you can modify the maximum import file size. To do so, use the `max_import_size` option in the [Application settings API](settings.md#change-application-settings) or the [**Admin** area](../administration/settings/account_and_limit_settings.md).
+As an administrator, you can modify the maximum import file size. To do so, use the `max_import_size` option in the [Application settings API](settings.md#update-application-settings) or the [**Admin** area](../administration/settings/account_and_limit_settings.md).
 
 ## Import a file from a remote object storage
 
diff --git a/doc/api/rest/deprecations.md b/doc/api/rest/deprecations.md
index efecdbbd13d..65044386d02 100644
--- a/doc/api/rest/deprecations.md
+++ b/doc/api/rest/deprecations.md
@@ -133,7 +133,7 @@ The `default_branch_protection` field is deprecated in GitLab 17.0 for the follo
 
 - [New group API](../groups.md#create-a-group).
 - [Update group API](../groups.md#update-group-attributes).
-- [Application API](../settings.md#change-application-settings)
+- [Application Settings API](../settings.md#update-application-settings)
 
 You should use the `default_branch_protection_defaults` field instead, which provides more finer grained control
 over the default branch protections.
diff --git a/doc/api/settings.md b/doc/api/settings.md
index 077a17b7cca..f6ed52a43bc 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -11,7 +11,7 @@ DETAILS:
 **Offering:** GitLab Self-Managed, GitLab Dedicated
 
 Use this API to interact with the
-[application settings](#list-of-settings-that-can-be-accessed-via-api-calls)
+[application settings](#available-settings)
 for your GitLab instance.
 
 Changes to your application settings are subject to caching and might not immediately take effect.
@@ -22,7 +22,7 @@ Prerequisites:
 
 - You must have administrator access to the instance.
 
-## Get current application settings
+## Get details on current application settings
 
 > - `always_perform_delayed_deletion` feature flag [enabled](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113332) in GitLab 15.11.
 > - `delayed_project_deletion` and `delayed_group_deletion` attributes removed in GitLab 16.0.
@@ -31,15 +31,16 @@ Prerequisites:
 > - `user_email_lookup_limit` attribute [removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136886) in GitLab 16.7.
 > - `allow_all_integrations` and `allowed_integrations` attributes [added](https://gitlab.com/gitlab-org/gitlab/-/issues/500610) in GitLab 17.6.
 
-List the current [application settings](#list-of-settings-that-can-be-accessed-via-api-calls)
-of the GitLab instance.
+Gets details on the current [application settings](#available-settings) for this GitLab instance.
 
 ```plaintext
 GET /application/settings
 ```
 
 ```shell
-curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/application/settings"
+curl --request GET \
+  --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/application/settings"
 ```
 
 Example response:
@@ -199,7 +200,7 @@ these parameters:
 }
 ```
 
-## Change application settings
+## Update application settings
 
 > - `always_perform_delayed_deletion` feature flag [enabled](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113332) in GitLab 15.11.
 > - `delayed_project_deletion` and `delayed_group_deletion` attributes removed in GitLab 16.0.
@@ -207,15 +208,16 @@ these parameters:
 > - `default_branch_protection` [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/408314) in GitLab 17.0. Use `default_branch_protection_defaults` instead.
 > - `allow_all_integrations` and `allowed_integrations` attributes [added](https://gitlab.com/gitlab-org/gitlab/-/issues/500610) in GitLab 17.6.
 
-Use an API call to modify GitLab instance
-[application settings](#list-of-settings-that-can-be-accessed-via-api-calls).
+Updates the current [application settings](#available-settings) for this GitLab instance.
 
 ```plaintext
 PUT /application/settings
 ```
 
 ```shell
-curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/application/settings?signup_enabled=false&default_project_visibility=internal"
+curl --request PUT \
+  --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/application/settings?signup_enabled=false&default_project_visibility=internal"
 ```
 
 Example response:
@@ -373,7 +375,7 @@ Example responses:
   "allowed_integrations": []
 ```
 
-## List of settings that can be accessed via API calls
+## Available settings
 
 > - `housekeeping_full_repack_period`, `housekeeping_gc_period`, and `housekeeping_incremental_repack_period` [deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106963) in GitLab 15.8. Use `housekeeping_optimize_repository_period` instead.
 > - `allow_account_deletion` [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/412411) in GitLab 16.1.
@@ -383,9 +385,9 @@ Example responses:
 > - `receptive_cluster_agents_enabled` [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/463427) in GitLab 17.4.
 > - `allow_all_integrations` and `allowed_integrations` [added](https://gitlab.com/gitlab-org/gitlab/-/issues/500610) in GitLab 17.6.
 
-In general, all settings are optional. Certain settings though, if enabled,
-require other settings to be set to function properly. These requirements are
-listed in the descriptions of the relevant settings.
+In general, all settings are optional. When enabling some settings, you might also need
+to configure other related settings. These requirements are
+`Required` column of the following table.
 
 | Attribute                                | Type             | Required                             | Description |
 |------------------------------------------|------------------|:------------------------------------:|-------------|
@@ -541,10 +543,10 @@ listed in the descriptions of the relevant settings.
 | `hide_third_party_offers`                | boolean          | no                                   | Do not display offers from third parties in GitLab. |
 | `home_page_url`                          | string           | no                                   | Redirect to this URL when not logged in. |
 | `housekeeping_bitmaps_enabled`           | boolean          | no                                   | Deprecated. Git packfile bitmap creation is always enabled and cannot be changed via API and UI. Always returns `true`. |
-| `housekeeping_enabled`                   | boolean          | no                                   | Enable or disable Git housekeeping. Requires additional fields to be set. For more information, see [Housekeeping fields](#housekeeping-fields). |
-| `housekeeping_full_repack_period`        | integer          | no                                   | Deprecated. Number of Git pushes after which an incremental `git repack` is run. Use `housekeeping_optimize_repository_period` instead. For more information, see [Housekeeping fields](#housekeeping-fields). |
-| `housekeeping_gc_period`                 | integer          | no                                   | Deprecated. Number of Git pushes after which `git gc` is run. Use `housekeeping_optimize_repository_period` instead. For more information, see [Housekeeping fields](#housekeeping-fields). |
-| `housekeeping_incremental_repack_period` | integer          | no                                   | Deprecated. Number of Git pushes after which an incremental `git repack` is run. Use `housekeeping_optimize_repository_period` instead. For more information, see [Housekeeping fields](#housekeeping-fields).|
+| `housekeeping_enabled`                   | boolean          | no                                   | Enable or disable Git housekeeping. Requires additional fields to be set. For more information, see [Housekeeping settings](#housekeeping-settings). |
+| `housekeeping_full_repack_period`        | integer          | no                                   | Deprecated. Number of Git pushes after which an incremental `git repack` is run. Use `housekeeping_optimize_repository_period` instead. For more information, see [Housekeeping settings](#housekeeping-settings). |
+| `housekeeping_gc_period`                 | integer          | no                                   | Deprecated. Number of Git pushes after which `git gc` is run. Use `housekeeping_optimize_repository_period` instead. For more information, see [Housekeeping settings](#housekeeping-settings). |
+| `housekeeping_incremental_repack_period` | integer          | no                                   | Deprecated. Number of Git pushes after which an incremental `git repack` is run. Use `housekeeping_optimize_repository_period` instead. For more information, see [Housekeeping settings](#housekeeping-settings).|
 | `housekeeping_optimize_repository_period`| integer          | no                                   | Number of Git pushes after which an incremental `git repack` is run. |
 | `html_emails_enabled`                    | boolean          | no                                   | Enable HTML emails. |
 | `import_sources`                         | array of strings | no                                   | Sources to allow project import from, possible values: `github`, `bitbucket`, `bitbucket_server`, `fogbugz`, `git`, `gitlab_project`, `gitea`, and `manifest`. |
@@ -728,7 +730,7 @@ listed in the descriptions of the relevant settings.
 | `require_admin_two_factor_authentication` | boolean         | no | Allow administrators to require 2FA for all administrators on the instance. |
 | `pre_receive_secret_detection_enabled` | boolean         | no | Allow projects to enable secret push protection. This does not enable secret push protection. When you enable this feature, you accept the [GitLab Testing Agreement](https://handbook.gitlab.com/handbook/legal/testing-agreement/). Ultimate only. |
 
-### Configure inactive project deletion
+### Inactive project settings
 
 You can configure inactive projects deletion or turn it off.
 
@@ -739,7 +741,7 @@ You can configure inactive projects deletion or turn it off.
 | `inactive_projects_min_size_mb`          | integer          | no                                   | If `delete_inactive_projects` is `true`, the minimum repository size for projects to be checked for inactivity. Default is `0`. [Became operational](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85689) in GitLab 15.0. |
 | `inactive_projects_send_warning_email_after_months` | integer | no                                 | If `delete_inactive_projects` is `true`, sets the time (in months) to wait before emailing maintainers that the project is scheduled be deleted because it is inactive. Default is `1`. [Became operational](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85689) in GitLab 15.0. |
 
-## Housekeeping fields
+### Housekeeping settings
 
 ::Tabs
 
@@ -761,7 +763,7 @@ to be set, or _all_ of these values to be set:
 
 ::EndTabs
 
-### Package registry: Package file size limits
+### Package registry settings: Package file size limits
 
 The package file size limits are not part of the Application settings API.
 Instead, these settings can be accessed using the [Plan limits API](plan_limits.md).
diff --git a/doc/api/statistics.md b/doc/api/statistics.md
index 0481cbcbdfc..b951a7ee507 100644
--- a/doc/api/statistics.md
+++ b/doc/api/statistics.md
@@ -10,24 +10,30 @@ DETAILS:
 **Tier:** Free, Premium, Ultimate
 **Offering:** GitLab Self-Managed, GitLab Dedicated
 
-## Get current application statistics
-
 Use this API to retrieve statistics from your GitLab instance.
 
 Prerequisites:
 
 - You must have administrator access to the instance.
 
+## Get details on current application statistics
+
+Gets details on the current application statistics.
+
 NOTE:
-These statistics show exact counts for values less than 10,000. For values of 10,000 and higher, these statistics show approximate data
-when [TablesampleCountStrategy](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/database/count/tablesample_count_strategy.rb?ref_type=heads#L16) and [ReltuplesCountStrategy](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/database/count/reltuples_count_strategy.rb?ref_type=heads) strategies are used for calculations.
+For values less than 10,000, this endpoint returns an exact count. For values of 10,000 and greater, this endpoint only returns approximate data when
+[TablesampleCountStrategy](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/database/count/tablesample_count_strategy.rb?ref_type=heads#L16)
+and [ReltuplesCountStrategy](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/database/count/reltuples_count_strategy.rb?ref_type=heads)
+strategies are used for calculations.
 
 ```plaintext
 GET /application/statistics
 ```
 
 ```shell
-curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/application/statistics"
+curl --request GET \
+  --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/application/statistics"
 ```
 
 Example response:
diff --git a/doc/security/hardening_nist_800_53.md b/doc/security/hardening_nist_800_53.md
index ee5b2c55fa5..60f1653d68e 100644
--- a/doc/security/hardening_nist_800_53.md
+++ b/doc/security/hardening_nist_800_53.md
@@ -150,7 +150,7 @@ requirements:
 - [Unlock users](unlock_user.md).
   By default, GitLab locks users after 10 failed sign-in attempts.
   Users remain locked for 10 minutes or until an administrator unlocks
-  the user. In GitLab 16.5 and later, administrators can [use the API](../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls)
+  the user. In GitLab 16.5 and later, administrators can [use the API](../api/settings.md#available-settings)
   to configure max login attempts and time period for remaining locked
   out. Per guidance in AC-7, FedRAMP defers to NIST 800-63B for
   defining parameters for account lockouts, which the default setting
diff --git a/doc/security/two_factor_authentication.md b/doc/security/two_factor_authentication.md
index 4e689bf6f75..4bf755cfd46 100644
--- a/doc/security/two_factor_authentication.md
+++ b/doc/security/two_factor_authentication.md
@@ -55,7 +55,7 @@ Use the [application settings API](../api/settings.md) to modify the following s
 - `require_two_factor_authentication`.
 - `two_factor_grace_period`.
 
-For more information, see the [list of settings that can be accessed through API calls](../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls).
+For more information, see the [list of settings that can be accessed through API calls](../api/settings.md#available-settings).
 
 ## Enforce 2FA for Administrator users
 
diff --git a/doc/security/unlock_user.md b/doc/security/unlock_user.md
index 3dfe888cf61..069e79e2f20 100644
--- a/doc/security/unlock_user.md
+++ b/doc/security/unlock_user.md
@@ -31,7 +31,7 @@ DETAILS:
 
 By default, user accounts are locked after 10 failed sign-in attempts. Accounts are unlocked automatically after 10 minutes.
 
-In GitLab 16.5 and later, administrators can use the [Application settings API](../api/settings.md#change-application-settings) to modify the `max_login_attempts` or `failed_login_attempts_unlock_period_in_minutes` settings.
+In GitLab 16.5 and later, administrators can use the [Application settings API](../api/settings.md#update-application-settings) to modify the `max_login_attempts` or `failed_login_attempts_unlock_period_in_minutes` settings.
 
 Administrators can unlock accounts immediately by using the following tasks:
 
diff --git a/doc/topics/autodevops/customize.md b/doc/topics/autodevops/customize.md
index b403bcfe374..9a13f77a241 100644
--- a/doc/topics/autodevops/customize.md
+++ b/doc/topics/autodevops/customize.md
@@ -131,7 +131,7 @@ variables:
 
 You can extend and manage your Auto DevOps configuration with GitLab APIs:
 
-- [Use API calls to access settings](../../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls),
+- [Use API calls to access settings](../../api/settings.md#available-settings),
   which include `auto_devops_enabled`, to enable Auto DevOps on projects by default.
 - [Create a new project](../../api/projects.md#create-a-project).
 - [Edit groups](../../api/groups.md#update-group-attributes).
diff --git a/doc/user/asciidoc.md b/doc/user/asciidoc.md
index ca784be12cb..8aee6e28c17 100644
--- a/doc/user/asciidoc.md
+++ b/doc/user/asciidoc.md
@@ -252,7 +252,7 @@ problems, GitLab enforces a maximum limit on the number of include directives
 processed in any one document. By default, a document can have up to 32 include directives, which is
 inclusive of transitive dependencies. To customize the number of processed includes directives, change
 the application setting `asciidoc_max_includes` with the
-[application settings API](../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls).
+[application settings API](../api/settings.md#available-settings).
 
 NOTE:
 The current maximum allowed value for `asciidoc_max_includes` is 64. If the value is
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index f36708dffdb..2a437742eee 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -1615,7 +1615,7 @@ By default, a document can have up to 32 include directives.
 
 To customize the number of processed include directives, administrators can change the
 `asciidoc_max_includes` application setting with the
-[application settings API](../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls).
+[application settings API](../api/settings.md#available-settings).
 
 ### Use includes from external URLs
 
diff --git a/doc/user/packages/package_registry/index.md b/doc/user/packages/package_registry/index.md
index cccb7a6258f..fb8a583aaa0 100644
--- a/doc/user/packages/package_registry/index.md
+++ b/doc/user/packages/package_registry/index.md
@@ -47,7 +47,7 @@ For information on how to create and upload a package, view the GitLab documenta
 
 ## Authenticate with the registry
 
-Authentication depends on the package manager being used. To learn what authentication protocols are supported for a specific package type, see [Authentication protocols](../../packages/package_registry/supported_functionality.md#authentication-protocols). 
+Authentication depends on the package manager being used. To learn what authentication protocols are supported for a specific package type, see [Authentication protocols](../../packages/package_registry/supported_functionality.md#authentication-protocols).
 
 For most package types, the following credential types are valid:
 
@@ -172,7 +172,7 @@ Prerequisites:
 
 To hide the **Allow anyone to pull from Package Registry** toggle globally:
 
-- [Change the application setting](../../../api/settings.md#change-application-settings) `package_registry_allow_anyone_to_pull_option` to `false`.
+- [Update the application setting](../../../api/settings.md#update-application-settings) `package_registry_allow_anyone_to_pull_option` to `false`.
 
 Anonymous downloads are disabled, even for projects that turned on the **Allow anyone to pull from Package Registry** toggle.
 
diff --git a/doc/user/profile/personal_access_tokens.md b/doc/user/profile/personal_access_tokens.md
index 4427f85c985..4db5d9d8e8d 100644
--- a/doc/user/profile/personal_access_tokens.md
+++ b/doc/user/profile/personal_access_tokens.md
@@ -116,7 +116,7 @@ or the Admin UI to disable personal access tokens.
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/384201) in GitLab 15.7.
 
-In GitLab 15.7 and later, you can use the [`disable_personal_access_tokens` attribute in the application settings API](../../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls) to disable personal access tokens.
+In GitLab 15.7 and later, you can use the [`disable_personal_access_tokens` attribute in the application settings API](../../api/settings.md#available-settings) to disable personal access tokens.
 
 NOTE:
 After you have used the API to disable personal access tokens, those tokens cannot be used in subsequent API calls to manage this setting. To re-enable personal access tokens, you must use the [GitLab Rails console](../../administration/operations/rails_console.md). You can also upgrade to GitLab 17.3 or later so you can use the Admin UI instead.
diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md
index d44115f1667..116d6eb9934 100644
--- a/doc/user/profile/preferences.md
+++ b/doc/user/profile/preferences.md
@@ -49,7 +49,7 @@ To change the syntax highlighting theme:
 
 To view the updated syntax highlighting theme, refresh your project's page.
 
-To customize the syntax highlighting theme, you can also [use the Application settings API](../../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls). Use `default_syntax_highlighting_theme` to change the syntax highlighting colors on a more granular level.
+To customize the syntax highlighting theme, you can also [use the Application settings API](../../api/settings.md#available-settings). Use `default_syntax_highlighting_theme` to change the syntax highlighting colors on a more granular level.
 
 If these steps do not work, your programming language might not be supported by the syntax highlighters.
 For more information, view [Rouge Ruby Library](https://github.com/rouge-ruby/rouge) for guidance on code files and Snippets. View [Monaco Editor](https://microsoft.github.io/monaco-editor/) and [Monarch](https://microsoft.github.io/monaco-editor/monarch.html) for guidance on the Web IDE.
diff --git a/doc/user/project/codeowners/reference.md b/doc/user/project/codeowners/reference.md
index 9cced70b448..e45bc1a7f6e 100644
--- a/doc/user/project/codeowners/reference.md
+++ b/doc/user/project/codeowners/reference.md
@@ -241,21 +241,46 @@ role as Code Owners for `file.md`:
 
 ## Add a group as a Code Owner
 
-To set the members of a group or subgroup as a Code Owner:
+You can set **direct members** of a group or subgroup as a Code Owner.
+For more information about group membership, see [Membership types](../../project/members/index.md#membership-types).
 
-In the `CODEOWNERS` file, enter text that follows one of these patterns:
+To set direct members of a group or subgroup as a Code Owner:
+
+1. Open the `CODEOWNERS` file.
+1. Enter text that follows one of these patterns:
+
+   ```plaintext
+   # All direct group members as Code Owners for a file
+   file.md @group-x
+
+   # All direct subgroup members as Code Owners for a file
+   file.md @group-x/subgroup-y
+
+   # All direct group and direct subgroup members as Code Owners for a file
+   file.md @group-x @group-x/subgroup-y
+   ```
+
+1. Save the file.
+1. Commit and merge the changes.
+
+### Example configuration
 
 ```plaintext
-# All group members as Code Owners for a file
-file.md @group-x
-
-# All subgroup members as Code Owners for a file
-file.md @group-x/subgroup-y
-
-# All group and subgroup members as Code Owners for a file
-file.md @group-x @group-x/subgroup-y
+[Maintainers]
+* @gitlab-org/maintainers/group-name
 ```
 
+In this example:
+
+- The group `group-name` is listed under the `[Maintainers]` section.
+- The `group-name` contains the following direct members:
+
+  ![List of group members.](../img/direct_group_members_v17_9.png)
+
+- In the merge request approval widget, the same direct members are listed as `Maintainers`:
+
+  ![Merge request maintainers.](../img/merge_request_maintainers_v17_9.png)
+
 NOTE:
 When [Global SAML group memberships lock](../../group/saml_sso/group_sync.md#global-saml-group-memberships-lock) is enabled, you cannot set a group or subgroup as a Code Owner. For more information, see [Incompatibility with Global SAML group memberships lock](troubleshooting.md#incompatibility-with-global-saml-group-memberships-lock).
 
diff --git a/doc/user/project/img/direct_group_members_v17_9.png b/doc/user/project/img/direct_group_members_v17_9.png
new file mode 100644
index 0000000000000000000000000000000000000000..3aa1d7eeef1b2939f7a946cc1ef469ca737a92d9
GIT binary patch
literal 30845
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

literal 0
HcmV?d00001

diff --git a/doc/user/project/img/merge_request_maintainers_v17_9.png b/doc/user/project/img/merge_request_maintainers_v17_9.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6ecad4fc996a43827acedbdff5c247392fece38
GIT binary patch
literal 9694
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

literal 0
HcmV?d00001

diff --git a/doc/user/project/integrations/index.md b/doc/user/project/integrations/index.md
index 70212a51f94..b9c58bdc699 100644
--- a/doc/user/project/integrations/index.md
+++ b/doc/user/project/integrations/index.md
@@ -184,7 +184,7 @@ If a single push includes changes to more than three branches or tags, integrati
 supported by `push_hooks` and `tag_push_hooks` events are not executed.
 
 To change the number of supported branches or tags, configure the
-[`push_event_hooks_limit` setting](../../../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls).
+[`push_event_hooks_limit` setting](../../../api/settings.md#available-settings).
 
 ## SSL verification
 
diff --git a/doc/user/project/integrations/webhook_events.md b/doc/user/project/integrations/webhook_events.md
index cbf7341e018..b93e0de2339 100644
--- a/doc/user/project/integrations/webhook_events.md
+++ b/doc/user/project/integrations/webhook_events.md
@@ -56,7 +56,7 @@ Push events are triggered when you push to the repository, except when:
 
 - You push tags.
 - A single push includes changes for more than three branches by default
-  (depending on the [`push_event_hooks_limit` setting](../../../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls)).
+  (depending on the [`push_event_hooks_limit` setting](../../../api/settings.md#available-settings)).
 
 If you push more than 20 commits at once, the `commits`
 attribute in the payload contains information about the newest 20 commits only.
@@ -155,7 +155,7 @@ Tag events are triggered when you create or delete tags in the repository.
 
 This hook is not executed if a single push includes changes for more than three
 tags by default (depending on the
-[`push_event_hooks_limit` setting](../../../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls)).
+[`push_event_hooks_limit` setting](../../../api/settings.md#available-settings)).
 
 Request header:
 
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index 04e6fb4fb54..0f031b77065 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -286,7 +286,7 @@ DETAILS:
 
 Administrators can set the maximum import file size one of two ways:
 
-- With the `max_import_size` option in the [Application settings API](../../../api/settings.md#change-application-settings).
+- With the `max_import_size` option in the [Application settings API](../../../api/settings.md#update-application-settings).
 - In the [**Admin** area UI](../../../administration/settings/import_and_export_settings.md#max-import-size).
 
 The default is `0` (unlimited).
@@ -342,7 +342,7 @@ The maximum import file size depends on whether you import to GitLab Self-Manage
 
 - If importing to a GitLab Self-Managed instance, you can import a import file of any size. Administrators can change
   this behavior using either:
-  - The `max_import_size` option in the [Application settings API](../../../api/settings.md#change-application-settings).
+  - The `max_import_size` option in the [Application settings API](../../../api/settings.md#update-application-settings).
   - The [**Admin** area](../../../administration/settings/account_and_limit_settings.md).
 - On GitLab.com, you can import groups using import files of no more than
   [5 GB](../../gitlab_com/index.md#account-and-limit-settings) in size.
diff --git a/keeps/overdue_finalize_background_migration.rb b/keeps/overdue_finalize_background_migration.rb
index 83c6130bd16..ce8c0d121cc 100644
--- a/keeps/overdue_finalize_background_migration.rb
+++ b/keeps/overdue_finalize_background_migration.rb
@@ -44,23 +44,28 @@ module Keeps
         migration_name = truncate_migration_name("Finalize#{migration['migration_job_name']}")
         PostDeploymentMigration::PostDeploymentMigrationGenerator
           .source_root('generator_templates/post_deployment_migration/post_deployment_migration/')
-        generator = ::PostDeploymentMigration::PostDeploymentMigrationGenerator.new([migration_name], { skip: true })
-        migration_file = generator.invoke_all.first
-        change.changed_files = [migration_file]
 
-        add_ensure_call_to_migration(migration_file, queue_method_node, job_name, migration_record)
-        ::Gitlab::Housekeeper::Shell.rubocop_autocorrect(migration_file)
+        begin
+          generator = ::PostDeploymentMigration::PostDeploymentMigrationGenerator.new([migration_name])
+          migration_file = generator.invoke_all.first
+          change.changed_files = [migration_file]
 
-        digest = Digest::SHA256.hexdigest(generator.migration_number)
-        digest_file = Pathname.new('db').join('schema_migrations', generator.migration_number.to_s).to_s
-        File.open(digest_file, 'w') { |f| f.write(digest) }
+          add_ensure_call_to_migration(migration_file, queue_method_node, job_name, migration_record)
+          ::Gitlab::Housekeeper::Shell.rubocop_autocorrect(migration_file)
 
-        add_finalized_by_to_yaml(migration_yaml_file, generator.migration_number)
+          digest = Digest::SHA256.hexdigest(generator.migration_number)
+          digest_file = Pathname.new('db').join('schema_migrations', generator.migration_number.to_s).to_s
+          File.open(digest_file, 'w') { |f| f.write(digest) }
 
-        change.changed_files << digest_file
-        change.changed_files << migration_yaml_file
+          add_finalized_by_to_yaml(migration_yaml_file, generator.migration_number)
 
-        yield(change)
+          change.changed_files << digest_file
+          change.changed_files << migration_yaml_file
+
+          yield(change)
+        rescue Rails::Generators::Error
+          next
+        end
       end
     end
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 3f188b5b873..21e4c17d54c 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1361,24 +1361,6 @@ msgid_plural "%{strongStart}%{count}%{strongEnd} commits"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "%{strongStart}%{you}%{strongEnd}%{break}%{name} left feedback"
-msgstr ""
-
-msgid "%{strongStart}%{you}%{strongEnd}%{break}%{name} requested changes"
-msgstr ""
-
-msgid "%{strongStart}%{you}%{strongEnd}%{break}%{name} started a review"
-msgstr ""
-
-msgid "%{strongStart}%{you}%{strongEnd}%{break}Approved by %{name}"
-msgstr ""
-
-msgid "%{strongStart}%{you}%{strongEnd}%{break}Assigned to %{name}"
-msgstr ""
-
-msgid "%{strongStart}%{you}%{strongEnd}%{break}Review requested from %{name}"
-msgstr ""
-
 msgid "%{strongStart}Merge reports (%{reportsCount}):%{strongEnd} %{summaryText}"
 msgstr ""
 
@@ -3647,6 +3629,9 @@ msgstr ""
 msgid "Adjust how frequently the GitLab UI polls for updates."
 msgstr ""
 
+msgid "Admin Area &gt; GitLab Duo"
+msgstr ""
+
 msgid "Admin Mode"
 msgstr ""
 
@@ -5826,6 +5811,9 @@ msgid_plural "All projects in %{groupsLength} groups:"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "All projects in authentication log"
+msgstr ""
+
 msgid "All projects selected"
 msgstr ""
 
@@ -7770,9 +7758,6 @@ msgstr ""
 msgid "Archiving the project makes it entirely read-only. It is hidden from the dashboard and doesn't display in searches. %{strong_start}The repository cannot be committed to, and no issues, comments, or other entities can be created.%{strong_end} %{link_start}Learn more.%{link_end}"
 msgstr ""
 
-msgid "Are you ABSOLUTELY SURE you wish to delete this group?"
-msgstr ""
-
 msgid "Are you absolutely sure?"
 msgstr ""
 
@@ -17186,6 +17171,9 @@ msgstr ""
 msgid "CredentialsInventory|Expiration date"
 msgstr ""
 
+msgid "CredentialsInventory|Expired"
+msgstr ""
+
 msgid "CredentialsInventory|GPG Keys"
 msgstr ""
 
@@ -17207,6 +17195,9 @@ msgstr ""
 msgid "CredentialsInventory|Project and group access tokens"
 msgstr ""
 
+msgid "CredentialsInventory|Revoke"
+msgstr ""
+
 msgid "CredentialsInventory|Revoked"
 msgstr ""
 
@@ -19063,6 +19054,9 @@ msgstr ""
 msgid "Delete group"
 msgstr ""
 
+msgid "Delete group immediately"
+msgstr ""
+
 msgid "Delete group immediately?"
 msgstr ""
 
@@ -19093,6 +19087,9 @@ msgstr ""
 msgid "Delete project"
 msgstr ""
 
+msgid "Delete project immediately"
+msgstr ""
+
 msgid "Delete release"
 msgstr ""
 
@@ -19137,9 +19134,6 @@ msgstr ""
 msgid "Delete this epic and release all child items?"
 msgstr ""
 
-msgid "Delete this project"
-msgstr ""
-
 msgid "Delete user list"
 msgstr ""
 
@@ -19200,9 +19194,6 @@ msgstr ""
 msgid "Deleted commits:"
 msgstr ""
 
-msgid "Deleted group can not be restored!"
-msgstr ""
-
 msgid "Deleted the source branch."
 msgstr ""
 
@@ -19221,9 +19212,6 @@ msgstr ""
 msgid "Deleting protected branches is blocked by security policies"
 msgstr ""
 
-msgid "Deleting this group also deletes all child projects, including archived projects, and their resources."
-msgstr ""
-
 msgid "Deletion scheduled at: %{time}"
 msgstr ""
 
@@ -27345,6 +27333,9 @@ msgstr ""
 msgid "Group navigation"
 msgstr ""
 
+msgid "Group or project"
+msgstr ""
+
 msgid "Group overview content"
 msgstr ""
 
@@ -41282,9 +41273,6 @@ msgstr ""
 msgid "Permalink"
 msgstr ""
 
-msgid "Permanently delete group"
-msgstr ""
-
 msgid "Permissions"
 msgstr ""
 
@@ -53540,6 +53528,9 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
+msgid "Settings &gt; GitLab Duo"
+msgstr ""
+
 msgid "Settings for the License Compliance feature"
 msgstr ""
 
@@ -57832,16 +57823,16 @@ msgstr ""
 msgid "This action cannot be undone, and will permanently delete the %{key} SSH key. All commits signed using this SSH key will be marked as unverified."
 msgstr ""
 
-msgid "This action deletes %{codeOpen}%{project_path_with_namespace}%{codeClose} and everything this project contains. %{strongOpen}There is no going back.%{strongClose}"
+msgid "This action will permanently delete this group, including its subgroups and projects."
 msgstr ""
 
-msgid "This action deletes %{codeOpen}%{project_path_with_namespace}%{codeClose} on %{date} and everything this project contains."
+msgid "This action will permanently delete this project, including all its resources."
 msgstr ""
 
-msgid "This action deletes %{codeOpen}%{project_path_with_namespace}%{codeClose} on %{date} and everything this project contains. %{strongOpen}There is no going back.%{strongClose}"
+msgid "This action will place this group, including its subgroups and projects, in a pending deletion state for %{deletion_delayed_period} days, and delete it permanently on %{date}."
 msgstr ""
 
-msgid "This action will %{strongOpen}permanently remove%{strongClose} %{codeOpen}%{group}%{codeClose} %{strongOpen}immediately%{strongClose}."
+msgid "This action will place this project, including all its resources, in a pending deletion state for %{deletion_adjourned_period} days, and delete it permanently on %{strongOpen}%{date}%{strongClose}."
 msgstr ""
 
 msgid "This also resolves all related threads"
@@ -58036,9 +58027,6 @@ msgstr ""
 msgid "This group and its subgroups and projects are pending deletion, and will be deleted on %{date}."
 msgstr ""
 
-msgid "This group and its subgroups and projects will be placed in a 'pending deletion' state for %{deletion_delayed_period} days, then permanently deleted on %{date}. The group can be fully restored before that date."
-msgstr ""
-
 msgid "This group can be restored until %{date}. %{linkStart}Learn more%{linkEnd}."
 msgstr ""
 
@@ -58075,6 +58063,9 @@ msgstr ""
 msgid "This group is not permitted to create compliance violations"
 msgstr ""
 
+msgid "This group is scheduled for deletion on %{date}. This action will permanently delete this group, including its subgroups and projects, %{strong_open}immediately%{strong_close}. This action cannot be undone."
+msgstr ""
+
 msgid "This group is scheduled to be deleted on %{date}. You are about to delete this group, including its subgroups and projects, immediately. This action cannot be undone."
 msgstr ""
 
@@ -58141,9 +58132,6 @@ msgstr ""
 msgid "This is the only time the secret is accessible. Copy the secret and store it securely."
 msgstr ""
 
-msgid "This is you."
-msgstr ""
-
 msgid "This is your current session"
 msgstr ""
 
@@ -58401,6 +58389,9 @@ msgstr ""
 msgid "This project is public. Non-members can guess the Service Desk email address, because it contains the group and project name. %{linkStart}How do I create a custom email address?%{linkEnd}"
 msgstr ""
 
+msgid "This project is scheduled for deletion on %{strongOpen}%{date}%{strongClose}. This action will permanently delete this project, including all its resources, %{strongOpen}immediately%{strongClose}. This action cannot be undone."
+msgstr ""
+
 msgid "This project manages its dependencies using %{strong_start}%{manager_name}%{strong_end}"
 msgstr ""
 
diff --git a/qa/qa/support/formatters/allure_metadata_formatter.rb b/qa/qa/support/formatters/allure_metadata_formatter.rb
index 34731b11536..e8f6c4bcafe 100644
--- a/qa/qa/support/formatters/allure_metadata_formatter.rb
+++ b/qa/qa/support/formatters/allure_metadata_formatter.rb
@@ -42,7 +42,7 @@ module QA
           example = example_notification.example
 
           add_quarantine_issue_link(example)
-          add_failure_issues_link(example)
+          add_failure_issues_link(example, example_notification)
           add_ci_job_link(example)
           set_flaky_status(example)
           set_behaviour_categories(example)
@@ -68,19 +68,21 @@ module QA
         #
         # @param [RSpec::Core::Example] example
         # @return [void]
-        def add_failure_issues_link(example)
+        def add_failure_issues_link(example, example_notification)
           return unless example.execution_result.status == :failed
 
           search_parameters = {
-            sort: "updated_desc",
-            scope: "all",
-            state: "opened"
-          }.map { |key, value| "#{key}=#{value}" }.join("&")
+            sort: 'updated_desc',
+            scope: 'all',
+            state: 'opened'
+          }.map { |key, value| "#{key}=#{value}" }.join('&')
 
+          exception_message = example.exception.message || ""
+          exception_message_lines = strip_ansi_codes(example_notification.message_lines) || []
           search_terms = {
-            test_file_path: ERB::Util.url_encode(example.file_path.gsub('./qa/specs/features/', '').to_s),
-            exception_message: ERB::Util.url_encode(example.exception.message)
-          }.map { |_, value| "search=#{value}" }.join("&")
+            test_file_path: example.file_path.gsub('./qa/specs/features/', '').to_s,
+            exception_message: exception_message_lines.empty? ? exception_message : exception_message_lines.join("\n")
+          }.map { |_, value| "search=#{ERB::Util.url_encode(value)}" }.join('&')
 
           search_url = "https://gitlab.com/gitlab-org/gitlab/-/issues?#{search_parameters}&#{search_terms}"
           example.issue('Failure issues', search_url)
@@ -88,6 +90,11 @@ module QA
           log(:error, "Failed to add failure issue link for example '#{example.description}', error: #{e}")
         end
 
+        def strip_ansi_codes(strings)
+          modified = Array(strings).map { |string| string.dup.gsub(/\x1b\[{1,2}[0-9;:?]*m/m, '') }
+          modified.size == 1 ? modified[0] : modified
+        end
+
         # Add ci job link
         #
         # @param [RSpec::Core::Example] example
diff --git a/qa/spec/support/formatters/allure_metadata_formatter_spec.rb b/qa/spec/support/formatters/allure_metadata_formatter_spec.rb
index 9a7bb84a1b2..53b515bfbe9 100644
--- a/qa/spec/support/formatters/allure_metadata_formatter_spec.rb
+++ b/qa/spec/support/formatters/allure_metadata_formatter_spec.rb
@@ -6,7 +6,11 @@ describe QA::Support::Formatters::AllureMetadataFormatter do
   let(:formatter) { described_class.new(StringIO.new) }
 
   let(:rspec_example_notification) do
-    instance_double(RSpec::Core::Notifications::ExampleNotification, example: rspec_example)
+    instance_double(
+      RSpec::Core::Notifications::FailedExampleNotification,
+      example: rspec_example,
+      message_lines: ["Some failure", "message"]
+    )
   end
 
   # rubocop:disable RSpec/VerifiedDoubles
@@ -49,9 +53,29 @@ describe QA::Support::Formatters::AllureMetadataFormatter do
       expect(rspec_example).to have_received(:issue).with(
         'Failure issues',
         'https://gitlab.com/gitlab-org/gitlab/-/issues?sort=updated_desc&scope=all&state=opened&' \
-          'search=spec.rb&search=Some%20failure%20message'
+          'search=spec.rb&search=Some%20failure%0Amessage'
       )
     end
+
+    context 'when message_lines is empty' do
+      let(:rspec_example_notification) do
+        instance_double(
+          RSpec::Core::Notifications::FailedExampleNotification,
+          example: rspec_example,
+          message_lines: []
+        )
+      end
+
+      it 'uses exception message for the search URL', :aggregate_failures do
+        formatter.example_finished(rspec_example_notification)
+
+        expect(rspec_example).to have_received(:issue).with(
+          'Failure issues',
+          'https://gitlab.com/gitlab-org/gitlab/-/issues?sort=updated_desc&scope=all&state=opened&' \
+            'search=spec.rb&search=Some%20failure%20message'
+        )
+      end
+    end
   end
 
   context 'with flaky test data', :aggregate_failures do
diff --git a/spec/controllers/oauth/authorizations_controller_spec.rb b/spec/controllers/oauth/authorizations_controller_spec.rb
index 7a4b6f139fa..4c16d26ea6c 100644
--- a/spec/controllers/oauth/authorizations_controller_spec.rb
+++ b/spec/controllers/oauth/authorizations_controller_spec.rb
@@ -61,6 +61,21 @@ RSpec.describe Oauth::AuthorizationsController, :with_current_organization, feat
     end
   end
 
+  shared_examples 'RequestPayloadLogger information appended' do
+    it 'logs custom information in the payload' do
+      expect(controller).to receive(:append_info_to_payload).and_wrap_original do |method, payload|
+        method.call(payload)
+
+        expect(payload[:remote_ip]).to be_present
+        expect(payload[:username]).to eq(user.username)
+        expect(payload[:user_id]).to be_present
+        expect(payload[:ua]).to be_present
+      end
+
+      subject
+    end
+  end
+
   describe 'GET #new' do
     subject { get :new, params: params }
 
@@ -336,11 +351,15 @@ RSpec.describe Oauth::AuthorizationsController, :with_current_organization, feat
         end
       end
     end
+
+    it_behaves_like "RequestPayloadLogger information appended"
   end
 
   describe 'POST #create' do
     subject { post :create, params: params }
 
+    it_behaves_like "RequestPayloadLogger information appended"
+
     include_examples 'OAuth Authorizations require confirmed user'
   end
 
diff --git a/spec/factories/merge_request_approval_metrics.rb b/spec/factories/merge_request_approval_metrics.rb
new file mode 100644
index 00000000000..78f93f9427e
--- /dev/null
+++ b/spec/factories/merge_request_approval_metrics.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :merge_request_approval_metrics, class: "MergeRequest::ApprovalMetrics" do
+    merge_request
+    last_approved_at { Time.current }
+    target_project { merge_request.target_project }
+  end
+end
diff --git a/spec/frontend/ci/admin/jobs_table/admin_job_table_app_spec.js b/spec/frontend/ci/admin/jobs_table/admin_job_table_app_spec.js
index f64f9358d42..e5b62ed4e36 100644
--- a/spec/frontend/ci/admin/jobs_table/admin_job_table_app_spec.js
+++ b/spec/frontend/ci/admin/jobs_table/admin_job_table_app_spec.js
@@ -287,20 +287,39 @@ describe('Job table app', () => {
   });
 
   describe('cancel jobs button', () => {
-    it('should display cancel all jobs button', async () => {
-      createComponent({ cancelableHandler: cancelHandler, stubs: { JobsTableTabs } });
+    const options = {
+      cancelableHandler: cancelHandler,
+      stubs: { JobsTableTabs },
+    };
 
-      await waitForPromises();
+    describe('when there are cancelable jobs', () => {
+      it('should display cancel all jobs button', async () => {
+        createComponent({ ...options, provideOptions: { canUpdateAllJobs: true } });
 
-      expect(findCancelJobsButton().exists()).toBe(true);
+        await waitForPromises();
+
+        expect(findCancelJobsButton().exists()).toBe(true);
+      });
+
+      describe('when canUpdateAllJobs is false', () => {
+        it('should not display cancel all jobs button', async () => {
+          createComponent({ ...options, provideOptions: { canUpdateAllJobs: false } });
+
+          await waitForPromises();
+
+          expect(findCancelJobsButton().exists()).toBe(false);
+        });
+      });
     });
 
-    it('should not display cancel all jobs button', async () => {
-      createComponent();
+    describe('when there are no cancelable jobs', () => {
+      it('should not display cancel all jobs button', async () => {
+        createComponent({ provideOptions: { canUpdateAllJobs: true } });
 
-      await waitForPromises();
+        await waitForPromises();
 
-      expect(findCancelJobsButton().exists()).toBe(false);
+        expect(findCancelJobsButton().exists()).toBe(false);
+      });
     });
   });
 
diff --git a/spec/frontend/merge_request_dashboard/components/__snapshots__/assigned_users_spec.js.snap b/spec/frontend/merge_request_dashboard/components/__snapshots__/assigned_users_spec.js.snap
index 4a40fccacb9..70b8b32b23e 100644
--- a/spec/frontend/merge_request_dashboard/components/__snapshots__/assigned_users_spec.js.snap
+++ b/spec/frontend/merge_request_dashboard/components/__snapshots__/assigned_users_spec.js.snap
@@ -29,8 +29,10 @@ exports[`Merge request dashboard assigned users component renders user avatars 1
       class="gl-avatars-inline-child"
     >
       <a
-        class="gl-avatar-link gl-link gl-relative"
+        class="gl-avatar-link gl-link gl-relative js-user-link"
+        data-name="Admin"
         data-testid="assigned-user"
+        data-user-id="2"
         href="/root"
         target="blank"
       >
@@ -60,8 +62,10 @@ exports[`Merge request dashboard assigned users component renders user avatars 1
       class="gl-avatars-inline-child"
     >
       <a
-        class="gl-avatar-link gl-link gl-relative"
+        class="gl-avatar-link gl-link gl-relative js-user-link"
+        data-name="Admin"
         data-testid="assigned-user"
+        data-user-id="1"
         href="/root"
         target="blank"
       >
diff --git a/spec/frontend/merge_request_dashboard/components/assigned_users_spec.js b/spec/frontend/merge_request_dashboard/components/assigned_users_spec.js
index 9a237aa8f17..df295ec0986 100644
--- a/spec/frontend/merge_request_dashboard/components/assigned_users_spec.js
+++ b/spec/frontend/merge_request_dashboard/components/assigned_users_spec.js
@@ -2,7 +2,6 @@ import { mountExtended } from 'helpers/vue_test_utils_helper';
 import AssignedUsers from '~/merge_request_dashboard/components/assigned_users.vue';
 
 let wrapper;
-let glTooltipDirectiveMock;
 
 const createMockUsers = () => [
   {
@@ -27,12 +26,7 @@ function createComponent({
   type = 'ASSIGNEES',
   newListsEnabled = false,
 } = {}) {
-  glTooltipDirectiveMock = jest.fn();
-
   wrapper = mountExtended(AssignedUsers, {
-    directives: {
-      GlTooltip: glTooltipDirectiveMock,
-    },
     provide: {
       newListsEnabled,
     },
@@ -70,14 +64,6 @@ describe('Merge request dashboard assigned users component', () => {
       expect(findCurrentUserIcon().exists()).toBe(true);
     });
 
-    it('adds this is you text to tooltip', () => {
-      createComponent();
-
-      expect(glTooltipDirectiveMock.mock.calls[1][1].value).toBe(
-        '<strong>This is you.</strong><br />Assigned to Admin',
-      );
-    });
-
     it('renders current user last', () => {
       createComponent();
 
@@ -100,30 +86,5 @@ describe('Merge request dashboard assigned users component', () => {
       expect(findReviewStateIcon().exists()).toBe(true);
       expect(findReviewStateIcon().html()).toMatchSnapshot();
     });
-
-    it.each`
-      state                  | title
-      ${'REQUESTED_CHANGES'} | ${'Admin requested changes'}
-      ${'APPROVED'}          | ${'Approved by Admin'}
-      ${'REVIEWED'}          | ${'Admin left feedback'}
-      ${'UNREVIEWED'}        | ${'Review requested from Admin'}
-    `('sets title as $title for review state $state', ({ state, title }) => {
-      createComponent({
-        type: 'REVIEWER',
-        users: [
-          {
-            id: 'gid://gitlab/user/2',
-            webUrl: '/root',
-            name: 'Admin',
-            avatarUrl: '/root',
-            mergeRequestInteraction: {
-              reviewState: state,
-            },
-          },
-        ],
-      });
-
-      expect(glTooltipDirectiveMock.mock.calls[0][1].value).toBe(title);
-    });
   });
 });
diff --git a/spec/frontend/pages/admin/jobs/components/table/admin_job_table_app_spec.js b/spec/frontend/pages/admin/jobs/components/table/admin_job_table_app_spec.js
index 506cc7a43e4..b3d54bc7608 100644
--- a/spec/frontend/pages/admin/jobs/components/table/admin_job_table_app_spec.js
+++ b/spec/frontend/pages/admin/jobs/components/table/admin_job_table_app_spec.js
@@ -272,20 +272,39 @@ describe('Job table app', () => {
   });
 
   describe('cancel jobs button', () => {
-    it('should display cancel all jobs button', async () => {
-      createComponent({ cancelableHandler: cancelHandler, stubs: { JobsTableTabs } });
+    describe('when there are cancelable jobs', () => {
+      const options = {
+        cancelableHandler: cancelHandler,
+        stubs: { JobsTableTabs },
+      };
 
-      await waitForPromises();
+      it('should display cancel all jobs button', async () => {
+        createComponent({ ...options, provideOptions: { canUpdateAllJobs: true } });
 
-      expect(findCancelJobsButton().exists()).toBe(true);
+        await waitForPromises();
+
+        expect(findCancelJobsButton().exists()).toBe(true);
+      });
+
+      describe('when canUpdateAllJobs is false', () => {
+        it('should not display cancel all jobs button', async () => {
+          createComponent({ ...options, provideOptions: { canUpdateAllJobs: false } });
+
+          await waitForPromises();
+
+          expect(findCancelJobsButton().exists()).toBe(false);
+        });
+      });
     });
 
-    it('should not display cancel all jobs button', async () => {
-      createComponent();
+    describe('when there are no cancelable jobs', () => {
+      it('should not display cancel all jobs button', async () => {
+        createComponent({ provideOptions: { canUpdateAllJobs: true } });
 
-      await waitForPromises();
+        await waitForPromises();
 
-      expect(findCancelJobsButton().exists()).toBe(false);
+        expect(findCancelJobsButton().exists()).toBe(false);
+      });
     });
   });
 
diff --git a/spec/frontend/projects/components/project_delete_button_spec.js b/spec/frontend/projects/components/project_delete_button_spec.js
index bae76e7eeb6..8e3238cf2f2 100644
--- a/spec/frontend/projects/components/project_delete_button_spec.js
+++ b/spec/frontend/projects/components/project_delete_button_spec.js
@@ -18,6 +18,7 @@ describe('Project remove modal', () => {
     mergeRequestsCount: 2,
     forksCount: 3,
     starsCount: 4,
+    buttonText: 'Delete project',
   };
 
   const createComponent = (props = {}) => {
@@ -51,6 +52,7 @@ describe('Project remove modal', () => {
         issuesCount: defaultProps.issuesCount,
         mergeRequestsCount: defaultProps.mergeRequestsCount,
         starsCount: defaultProps.starsCount,
+        buttonText: defaultProps.buttonText,
       });
     });
   });
diff --git a/spec/frontend/projects/components/shared/delete_button_spec.js b/spec/frontend/projects/components/shared/delete_button_spec.js
index 556c1ae7084..b8758641d41 100644
--- a/spec/frontend/projects/components/shared/delete_button_spec.js
+++ b/spec/frontend/projects/components/shared/delete_button_spec.js
@@ -10,6 +10,7 @@ describe('DeleteButton', () => {
 
   const findForm = () => wrapper.findComponent(GlForm);
   const findModal = () => wrapper.findComponent(DeleteModal);
+  const findDeleteButton = () => wrapper.findComponent(GlButton);
 
   const defaultPropsData = {
     confirmPhrase: 'foo',
@@ -58,7 +59,7 @@ describe('DeleteButton', () => {
   describe('when button is clicked', () => {
     beforeEach(() => {
       createComponent();
-      wrapper.findComponent(GlButton).vm.$emit('click');
+      findDeleteButton().vm.$emit('click');
     });
 
     it('opens modal', () => {
@@ -85,4 +86,20 @@ describe('DeleteButton', () => {
 
     expect(wrapper.findByTestId('modal-footer-slot').exists()).toBe(true);
   });
+
+  it('renders default text', () => {
+    createComponent();
+
+    const button = findDeleteButton();
+
+    expect(button.text()).toBe('Delete project');
+  });
+
+  it('renders custom text', () => {
+    createComponent({ buttonText: 'Delete project immediately' });
+
+    const button = findDeleteButton();
+
+    expect(button.text()).toBe('Delete project immediately');
+  });
 });
diff --git a/spec/frontend/token_access/inbound_token_access_spec.js b/spec/frontend/token_access/inbound_token_access_spec.js
index b9076598071..0401416a979 100644
--- a/spec/frontend/token_access/inbound_token_access_spec.js
+++ b/spec/frontend/token_access/inbound_token_access_spec.js
@@ -6,6 +6,7 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import { createAlert } from '~/alert';
 import InboundTokenAccess from '~/token_access/components/inbound_token_access.vue';
+import { JOB_TOKEN_FORM_ADD_GROUP_OR_PROJECT } from '~/token_access/constants';
 import NamespaceForm from '~/token_access/components/namespace_form.vue';
 import inboundRemoveGroupCIJobTokenScopeMutation from '~/token_access/graphql/mutations/inbound_remove_group_ci_job_token_scope.mutation.graphql';
 import inboundRemoveProjectCIJobTokenScopeMutation from '~/token_access/graphql/mutations/inbound_remove_project_ci_job_token_scope.mutation.graphql';
@@ -58,6 +59,7 @@ describe('TokenAccess component', () => {
   const failureHandler = jest.fn().mockRejectedValue(error);
   const mockToastShow = jest.fn();
 
+  const findFormSelector = () => wrapper.findByTestId('form-selector');
   const findRadioGroup = () => wrapper.findComponent(GlFormRadioGroup);
   const findLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
   const findToggleFormBtn = () => wrapper.findByTestId('crud-form-toggle');
@@ -72,13 +74,18 @@ describe('TokenAccess component', () => {
 
   const createComponent = (
     requestHandlers,
-    { addPoliciesToCiJobToken = false, enforceAllowlist = false, stubs = {} } = {},
+    {
+      addPoliciesToCiJobToken = false,
+      authenticationLogsMigrationForAllowlist = false,
+      enforceAllowlist = false,
+      stubs = {},
+    } = {},
   ) => {
     wrapper = shallowMountExtended(InboundTokenAccess, {
       provide: {
         fullPath: projectPath,
         enforceAllowlist,
-        glFeatures: { addPoliciesToCiJobToken },
+        glFeatures: { addPoliciesToCiJobToken, authenticationLogsMigrationForAllowlist },
       },
       apolloProvider: createMockApollo(requestHandlers),
       mocks: {
@@ -349,6 +356,53 @@ describe('TokenAccess component', () => {
     });
   });
 
+  describe('when authenticationLogsMigrationForAllowlist feature flag is disabled', () => {
+    beforeEach(() =>
+      createComponent(
+        [
+          [
+            inboundGetGroupsAndProjectsWithCIJobTokenScopeQuery,
+            inboundGroupsAndProjectsWithScopeResponseHandler,
+          ],
+        ],
+        { authenticationLogsMigrationForAllowlist: false, stubs: { CrudComponent } },
+      ),
+    );
+
+    it('renders toggle form button and hides actions dropdown', () => {
+      expect(findToggleFormBtn().exists()).toBe(true);
+      expect(findFormSelector().exists()).toBe(false);
+    });
+  });
+
+  describe('when authenticationLogsMigrationForAllowlist feature flag is enabled', () => {
+    beforeEach(() =>
+      createComponent(
+        [
+          [
+            inboundGetGroupsAndProjectsWithCIJobTokenScopeQuery,
+            inboundGroupsAndProjectsWithScopeResponseHandler,
+          ],
+        ],
+        { authenticationLogsMigrationForAllowlist: true, stubs: { CrudComponent } },
+      ),
+    );
+
+    it('toggle form button is replaced by actions dropdown', () => {
+      expect(findToggleFormBtn().exists()).toBe(false);
+      expect(findFormSelector().exists()).toBe(true);
+    });
+
+    it('Add group or project option renders the namespace form', async () => {
+      expect(findNamespaceForm().exists()).toBe(false);
+
+      findFormSelector().vm.$emit('select', JOB_TOKEN_FORM_ADD_GROUP_OR_PROJECT);
+      await nextTick();
+
+      expect(findNamespaceForm().exists()).toBe(true);
+    });
+  });
+
   describe.each`
     type         | mutation                                       | handler
     ${'Group'}   | ${inboundRemoveGroupCIJobTokenScopeMutation}   | ${inboundRemoveGroupSuccessHandler}
diff --git a/spec/frontend/vue_shared/components/crud_component_spec.js b/spec/frontend/vue_shared/components/crud_component_spec.js
index d7b17bcc77a..01bc9914852 100644
--- a/spec/frontend/vue_shared/components/crud_component_spec.js
+++ b/spec/frontend/vue_shared/components/crud_component_spec.js
@@ -241,4 +241,15 @@ describe('CRUD Component', () => {
       );
     });
   });
+
+  describe('actions slot', () => {
+    it('passes the showForm function to the actions slot', () => {
+      const actionsSlot = jest.fn();
+      createComponent({}, { actions: actionsSlot });
+
+      expect(actionsSlot).toHaveBeenCalledWith(
+        expect.objectContaining({ showForm: wrapper.vm.showForm }),
+      );
+    });
+  });
 });
diff --git a/spec/helpers/admin/jobs_helper_spec.rb b/spec/helpers/admin/jobs_helper_spec.rb
new file mode 100644
index 00000000000..740e7b5d6e5
--- /dev/null
+++ b/spec/helpers/admin/jobs_helper_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Admin::JobsHelper, feature_category: :continuous_integration do
+  let_it_be(:user) { build_stubbed(:user, :admin) }
+
+  before do
+    allow(helper).to receive_messages(
+      current_user: user,
+      job_statuses: {}
+    )
+  end
+
+  describe '#admin_jobs_app_data', :enable_admin_mode do
+    subject(:data) { helper.admin_jobs_app_data }
+
+    it 'contains the correct data' do
+      expect(data).to include(
+        job_statuses: {}.to_json,
+        empty_state_svg_path: helper.image_path('illustrations/empty-state/empty-pipeline-md.svg'),
+        url: cancel_all_admin_jobs_path,
+        can_update_all_jobs: 'true'
+      )
+    end
+  end
+end
diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb
index bebbdc6e915..ff31479e15f 100644
--- a/spec/helpers/projects_helper_spec.rb
+++ b/spec/helpers/projects_helper_spec.rb
@@ -2024,15 +2024,13 @@ RSpec.describe ProjectsHelper, feature_category: :source_code_management do
     subject { helper.delete_immediately_message(project) }
 
     it 'returns correct message' do
-      expect(subject).to eq "This action deletes <code>#{project.path_with_namespace}</code> and everything this project contains. <strong>There is no going back.</strong>"
+      expect(subject).to eq "This action will permanently delete this project, including all its resources."
     end
   end
 
   describe '#project_delete_immediately_button_data' do
-    subject { helper.project_delete_immediately_button_data(project) }
-
-    it 'returns expected hash' do
-      expect(subject).to match({
+    let(:base_button_data) do
+      {
         form_path: project_path(project, permanently_delete: true),
         confirm_phrase: project.path_with_namespace,
         is_fork: 'false',
@@ -2040,7 +2038,23 @@ RSpec.describe ProjectsHelper, feature_category: :source_code_management do
         merge_requests_count: '0',
         forks_count: '0',
         stars_count: '0'
-      })
+      }
+    end
+
+    describe 'with default button text' do
+      subject { helper.project_delete_immediately_button_data(project) }
+
+      it 'returns expected hash' do
+        expect(subject).to match(base_button_data.merge(button_text: 'Delete project'))
+      end
+    end
+
+    describe 'with custom button text' do
+      subject { helper.project_delete_immediately_button_data(project, 'Delete project immediately') }
+
+      it 'returns expected hash' do
+        expect(subject).to match(base_button_data.merge(button_text: 'Delete project immediately'))
+      end
     end
   end
 
diff --git a/spec/keeps/overdue_finalize_background_migration_spec.rb b/spec/keeps/overdue_finalize_background_migration_spec.rb
index 64ec2e4211b..8cd32d32c48 100644
--- a/spec/keeps/overdue_finalize_background_migration_spec.rb
+++ b/spec/keeps/overdue_finalize_background_migration_spec.rb
@@ -67,4 +67,51 @@ RSpec.describe Keeps::OverdueFinalizeBackgroundMigration, feature_category: :too
       end
     end
   end
+
+  describe '#each_change' do
+    let(:migration) do
+      { 'milestone' => '15.0', 'migration_job_name' => 'TestMigration', 'feature_category' => 'shared' }
+    end
+
+    let(:migration_record) { MigrationRecord.new(id: 1, finished_at: "2020-04-01 12:00:01") }
+    let(:queue_method_node) do
+      instance_double(RuboCop::AST::SendNode, children: [nil, nil, nil,
+        instance_double(RuboCop::AST::StrNode, source: 'table'),
+        instance_double(RuboCop::AST::StrNode, source: 'column')])
+    end
+
+    let(:generator) { instance_double(::PostDeploymentMigration::PostDeploymentMigrationGenerator) }
+    let(:groups_helper) { instance_double(::Keeps::Helpers::Groups) }
+
+    before do
+      allow(keep).to receive_messages(batched_background_migrations: { 'path/to/migration.yml' => migration },
+        before_cuttoff_milestone?: true, migration_finalized?: false, fetch_migration_status: migration_record,
+        last_migration_for_job: 'path/to/last_migration.rb', find_queue_method_node: queue_method_node,
+        groups_helper: groups_helper
+      )
+      allow(groups_helper).to receive_messages(labels_for_feature_category: [],
+        pick_reviewer_for_feature_category: "reviewer")
+      allow(PostDeploymentMigration::PostDeploymentMigrationGenerator).to receive(:source_root)
+
+      stub_request(:any, /.*/).to_return(status: 200, body: "", headers: {})
+    end
+
+    context 'when generator raises Rails::Generators::Error' do
+      before do
+        allow(::PostDeploymentMigration::PostDeploymentMigrationGenerator).to receive(:new)
+          .and_raise(Rails::Generators::Error)
+      end
+
+      it 'skips to the next iteration' do
+        changes = []
+        keep.each_change { |change| changes << change }
+
+        expect(changes).to be_empty
+      end
+
+      it 'does not raise the error' do
+        expect { keep.each_change { |change| change } }.not_to raise_error
+      end
+    end
+  end
 end
diff --git a/spec/models/merge_request/approval_metrics_spec.rb b/spec/models/merge_request/approval_metrics_spec.rb
new file mode 100644
index 00000000000..9e3a3c0681b
--- /dev/null
+++ b/spec/models/merge_request/approval_metrics_spec.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe MergeRequest::ApprovalMetrics, feature_category: :code_review_workflow do
+  describe 'associations' do
+    it { is_expected.to belong_to(:merge_request).required }
+    it { is_expected.to belong_to(:target_project).class_name('Project').inverse_of(:merge_requests).required }
+  end
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:last_approved_at) }
+  end
+
+  describe '.refresh_last_approved_at' do
+    let(:merge_request) { create(:merge_request) }
+
+    it 'creates a new record if it does not exist' do
+      expect do
+        described_class.refresh_last_approved_at(
+          merge_request: merge_request,
+          last_approved_at: Time.current
+        )
+      end.to change { described_class.count }.by(1)
+    end
+
+    it 'updates an existing record if it exists' do
+      existing_metrics = create(:merge_request_approval_metrics, merge_request: merge_request)
+      new_timestamp = Time.current
+
+      described_class.refresh_last_approved_at(
+        merge_request: merge_request,
+        last_approved_at: new_timestamp
+      )
+
+      existing_metrics.reload
+      expect(existing_metrics.last_approved_at).to be_within(1.second).of(new_timestamp)
+    end
+
+    it 'sets the last_approved_at to the expected time', :freeze_time do
+      described_class.refresh_last_approved_at(
+        merge_request: merge_request,
+        last_approved_at: Time.current
+      )
+
+      metrics = described_class.find_by!(merge_request_id: merge_request.id)
+      expect(metrics.last_approved_at).to be_within(1.second).of(Time.current)
+    end
+
+    it 'does not update last_approved_at if the new timestamp is older' do
+      newer_timestamp = 2.days.from_now
+      older_timestamp = 1.day.from_now
+
+      existing_metrics = create(
+        :merge_request_approval_metrics,
+        merge_request: merge_request,
+        last_approved_at: newer_timestamp
+      )
+
+      described_class.refresh_last_approved_at(
+        merge_request: merge_request,
+        last_approved_at: older_timestamp
+      )
+
+      existing_metrics.reload
+      expect(existing_metrics.last_approved_at).to be_within(1.second).of(newer_timestamp)
+    end
+  end
+end
diff --git a/spec/policies/global_policy_spec.rb b/spec/policies/global_policy_spec.rb
index 5f0fd9f459e..19554407025 100644
--- a/spec/policies/global_policy_spec.rb
+++ b/spec/policies/global_policy_spec.rb
@@ -741,4 +741,16 @@ RSpec.describe GlobalPolicy, feature_category: :shared do
       it { is_expected.to be_disallowed(:create_organizatinon) }
     end
   end
+
+  describe 'admin pages' do
+    context 'with regular user' do
+      it { is_expected.to be_disallowed(:read_admin_cicd) }
+    end
+
+    context 'with an admin', :enable_admin_mode do
+      let(:current_user) { admin_user }
+
+      it { is_expected.to be_allowed(:read_admin_cicd) }
+    end
+  end
 end
diff --git a/spec/requests/api/graphql/project/project_pipeline_statistics_spec.rb b/spec/requests/api/graphql/project/project_pipeline_statistics_spec.rb
index bfa3dc98d0a..c40313b90f0 100644
--- a/spec/requests/api/graphql/project/project_pipeline_statistics_spec.rb
+++ b/spec/requests/api/graphql/project/project_pipeline_statistics_spec.rb
@@ -242,11 +242,11 @@ RSpec.describe 'Query.project.pipelineAnalytics', :aggregate_failures, :click_ho
         context 'with no pipelines in time window', time_travel_to: Time.utc(2024, 1, 1) do
           let(:expected_duration_statistics) do
             {
-              'p50' => nil,
-              'p75' => nil,
-              'p90' => nil,
-              'p95' => nil,
-              'p99' => nil
+              'p50' => 0,
+              'p75' => 0,
+              'p90' => 0,
+              'p95' => 0,
+              'p99' => 0
             }
           end
 
diff --git a/spec/services/ci/collect_aggregate_pipeline_analytics_service_spec.rb b/spec/services/ci/collect_aggregate_pipeline_analytics_service_spec.rb
index e0ba7bbf8cb..765bcc924eb 100644
--- a/spec/services/ci/collect_aggregate_pipeline_analytics_service_spec.rb
+++ b/spec/services/ci/collect_aggregate_pipeline_analytics_service_spec.rb
@@ -105,7 +105,7 @@ RSpec.describe ::Ci::CollectAggregatePipelineAnalyticsService, :click_house, :en
         it 'returns empty aggregate analytics' do
           expect(result.errors).to eq([])
           expect(result.success?).to be true
-          expect(result.payload[:aggregate]).to eq(count: { any: 0 }, duration_statistics: { p50: nil, p99: nil })
+          expect(result.payload[:aggregate]).to eq(count: { any: 0 }, duration_statistics: { p50: 0, p99: 0 })
         end
       end
     end
diff --git a/spec/services/ci/register_job_service_spec.rb b/spec/services/ci/register_job_service_spec.rb
index 14faf6bca07..d99d9197885 100644
--- a/spec/services/ci/register_job_service_spec.rb
+++ b/spec/services/ci/register_job_service_spec.rb
@@ -97,9 +97,12 @@ module Ci
                         retrieve_queue_duration_s: anything,
                         process_build_duration_s: { count: 1, max: anything, sum: anything },
                         process_build_runner_matched_duration_s: { count: 1, max: anything, sum: anything },
-                        process_build_link_identity_duration_s: { count: 1, max: anything, sum: anything },
                         process_build_present_build_duration_s: { count: 1, max: anything, sum: anything },
-                        process_build_assign_runner_duration_s: { count: 1, max: anything, sum: anything }
+                        present_build_presenter_duration_s: { count: 1, max: anything, sum: anything },
+                        present_build_logs_duration_s: { count: 1, max: anything, sum: anything },
+                        present_build_response_json_duration_s: { count: 1, max: anything, sum: anything },
+                        process_build_assign_runner_duration_s: { count: 1, max: anything, sum: anything },
+                        assign_runner_run_duration_s: { count: 1, max: anything, sum: anything }
                       )
                     )
 
@@ -943,8 +946,7 @@ module Ci
                   total_duration_s: anything,
                   process_queue_duration_s: anything,
                   retrieve_queue_duration_s: anything,
-                  process_build_duration_s: { count: 1, max: anything, sum: anything },
-                  process_build_not_pending_duration_s: { count: 1, max: anything, sum: anything }
+                  process_build_duration_s: { count: 1, max: anything, sum: anything }
                 )
               )
 
diff --git a/spec/services/merge_requests/approval_service_spec.rb b/spec/services/merge_requests/approval_service_spec.rb
index 5697183561a..8fd78519893 100644
--- a/spec/services/merge_requests/approval_service_spec.rb
+++ b/spec/services/merge_requests/approval_service_spec.rb
@@ -108,7 +108,9 @@ RSpec.describe MergeRequests::ApprovalService, feature_category: :code_review_wo
       it 'publishes MergeRequests::ApprovedEvent' do
         expect { service.execute(merge_request) }
           .to publish_event(MergeRequests::ApprovedEvent)
-          .with(current_user_id: user.id, merge_request_id: merge_request.id)
+          .with(current_user_id: user.id,
+            merge_request_id: merge_request.id,
+            approved_at: anything)
       end
 
       it 'changes reviewers state to unapproved' do
diff --git a/spec/support/shared_examples/workers/auto_merge_from_event_shared_examples.rb b/spec/support/shared_examples/workers/auto_merge_from_event_shared_examples.rb
index 9e76fc6971e..9c6120022b3 100644
--- a/spec/support/shared_examples/workers/auto_merge_from_event_shared_examples.rb
+++ b/spec/support/shared_examples/workers/auto_merge_from_event_shared_examples.rb
@@ -6,7 +6,7 @@ RSpec.shared_examples 'process auto merge from event worker' do
   let_it_be(:merge_request) { create(:merge_request, source_project: project, merge_user: user) }
   let(:merge_request_id) { merge_request.id }
 
-  let(:data) { { current_user_id: user.id, merge_request_id: merge_request_id } }
+  let(:data) { { current_user_id: user.id, merge_request_id: merge_request_id, approved_at: Time.current.iso8601 } }
 
   it_behaves_like 'subscribes to event' do
     it 'calls AutoMergeService' do
diff --git a/spec/workers/merge_requests/create_approval_event_worker_spec.rb b/spec/workers/merge_requests/create_approval_event_worker_spec.rb
index a9a46420fd5..72c94c7c3ee 100644
--- a/spec/workers/merge_requests/create_approval_event_worker_spec.rb
+++ b/spec/workers/merge_requests/create_approval_event_worker_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe MergeRequests::CreateApprovalEventWorker, feature_category: :code
   let!(:user) { create(:user) }
   let!(:project) { create(:project) }
   let!(:merge_request) { create(:merge_request, source_project: project) }
-  let(:data) { { current_user_id: user.id, merge_request_id: merge_request.id } }
+  let(:data) { { current_user_id: user.id, merge_request_id: merge_request.id, approved_at: Time.current.iso8601 } }
   let(:approved_event) { MergeRequests::ApprovedEvent.new(data: data) }
 
   it_behaves_like 'subscribes to event' do
diff --git a/spec/workers/merge_requests/create_approval_note_worker_spec.rb b/spec/workers/merge_requests/create_approval_note_worker_spec.rb
index 1a9e15c18f0..413bd63605d 100644
--- a/spec/workers/merge_requests/create_approval_note_worker_spec.rb
+++ b/spec/workers/merge_requests/create_approval_note_worker_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe MergeRequests::CreateApprovalNoteWorker, feature_category: :code_
   let_it_be(:project) { create(:project) }
   let_it_be(:merge_request) { create(:merge_request, source_project: project) }
 
-  let(:data) { { current_user_id: user.id, merge_request_id: merge_request.id } }
+  let(:data) { { current_user_id: user.id, merge_request_id: merge_request.id, approved_at: Time.current.iso8601 } }
   let(:approved_event) { MergeRequests::ApprovedEvent.new(data: data) }
 
   it_behaves_like 'subscribes to event' do
diff --git a/spec/workers/merge_requests/execute_approval_hooks_worker_spec.rb b/spec/workers/merge_requests/execute_approval_hooks_worker_spec.rb
index 13c97f8fe49..4338b8482c2 100644
--- a/spec/workers/merge_requests/execute_approval_hooks_worker_spec.rb
+++ b/spec/workers/merge_requests/execute_approval_hooks_worker_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe MergeRequests::ExecuteApprovalHooksWorker, feature_category: :sou
   let_it_be(:project) { create(:project) }
   let_it_be(:merge_request) { create(:merge_request, source_project: project) }
 
-  let(:data) { { current_user_id: user.id, merge_request_id: merge_request.id } }
+  let(:data) { { current_user_id: user.id, merge_request_id: merge_request.id, approved_at: Time.current.iso8601 } }
   let(:approved_event) { MergeRequests::ApprovedEvent.new(data: data) }
 
   it_behaves_like 'subscribes to event' do
diff --git a/spec/workers/merge_requests/process_auto_merge_from_event_worker_spec.rb b/spec/workers/merge_requests/process_auto_merge_from_event_worker_spec.rb
index bd006ab5b7b..a9581a868b1 100644
--- a/spec/workers/merge_requests/process_auto_merge_from_event_worker_spec.rb
+++ b/spec/workers/merge_requests/process_auto_merge_from_event_worker_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe MergeRequests::ProcessAutoMergeFromEventWorker, feature_category:
   let_it_be(:merge_request) { create(:merge_request, source_project: project, merge_user: user) }
   let(:merge_request_id) { merge_request.id }
 
-  let(:data) { { current_user_id: user.id, merge_request_id: merge_request_id } }
+  let(:data) { { current_user_id: user.id, merge_request_id: merge_request_id, approved_at: Time.current.iso8601 } }
 
   it_behaves_like 'process auto merge from event worker' do
     let(:event) { ::MergeRequests::DiscussionsResolvedEvent.new(data: data) }
diff --git a/spec/workers/merge_requests/resolve_todos_after_approval_worker_spec.rb b/spec/workers/merge_requests/resolve_todos_after_approval_worker_spec.rb
index 39443d48ff6..fe7eb747e13 100644
--- a/spec/workers/merge_requests/resolve_todos_after_approval_worker_spec.rb
+++ b/spec/workers/merge_requests/resolve_todos_after_approval_worker_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe MergeRequests::ResolveTodosAfterApprovalWorker, feature_category:
   let_it_be(:project) { create(:project) }
   let_it_be(:merge_request) { create(:merge_request, source_project: project) }
 
-  let(:data) { { current_user_id: user.id, merge_request_id: merge_request.id } }
+  let(:data) { { current_user_id: user.id, merge_request_id: merge_request.id, approved_at: Time.current.iso8601 } }
   let(:approved_event) { MergeRequests::ApprovedEvent.new(data: data) }
 
   it_behaves_like 'subscribes to event' do