Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42

326 files changed, 1438 insertions, 734 deletions

diff --git a/config/application.rb b/config/application.rb
index 847577f68cb..d9a237eba50 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -315,7 +315,6 @@ module Gitlab
     config.assets.precompile << "page_bundles/jira_connect.css"
     config.assets.precompile << "page_bundles/learn_gitlab.css"
     config.assets.precompile << "page_bundles/login.css"
-    config.assets.precompile << "page_bundles/marketing_popover.css"
     config.assets.precompile << "page_bundles/members.css"
     config.assets.precompile << "page_bundles/merge_conflicts.css"
     config.assets.precompile << "page_bundles/merge_request_analytics.css"
@@ -613,8 +612,8 @@ module Gitlab
     # https://github.com/rails/rails/blob/fdf840f69a2e33d78a9d40b91d9b7fddb76711e9/activerecord/lib/active_record/railtie.rb#L308
     initializer :clear_active_connections_again, after: :set_routes_reloader_hook do
       # rubocop:disable Database/MultipleDatabases
-      ActiveRecord::Base.clear_active_connections!
-      ActiveRecord::Base.flush_idle_connections!
+      ActiveRecord::Base.connection_handler.clear_active_connections!(ActiveRecord::Base.current_role)
+      ActiveRecord::Base.connection_handler.flush_idle_connections!(ActiveRecord::Base.current_role)
       # rubocop:enable Database/MultipleDatabases
     end
 
diff --git a/config/audit_events/types/project_feature_model_registry_access_level_updated.yml b/config/audit_events/types/project_feature_model_registry_access_level_updated.yml
new file mode 100644
index 00000000000..2be827cfcad
--- /dev/null
+++ b/config/audit_events/types/project_feature_model_registry_access_level_updated.yml
@@ -0,0 +1,9 @@
+---
+name: project_feature_model_registry_access_level_updated
+description: Model registry access level was updated
+introduced_by_issue: https://gitlab.com/gitlab-org/gitlab/-/issues/412734
+introduced_by_mr: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138399
+feature_category: mlops
+milestone: '16.7'
+saved_to_database: true
+streamed: true
diff --git a/config/events/202109151015_cluster_applications_cluster_application_name.yml b/config/events/202109151015_cluster_applications_cluster_application_name.yml
deleted file mode 100644
index 0fde2277cfe..00000000000
--- a/config/events/202109151015_cluster_applications_cluster_application_name.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-description: Install cluster application
-category: cluster:applications
-action: cluster application name
-label_description:
-property_description:
-value_description:
-extra_properties:
-identifiers:
-product_section: ops
-product_stage: monitor
-product_group: group::monitor
-milestone: "12.7"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23000
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205107_default_click_link.yml b/config/events/20210915205107_default_click_link.yml
deleted file mode 100644
index 80081cc150b..00000000000
--- a/config/events/20210915205107_default_click_link.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-description: "Open frequent items dropdown"
-category: default
-action: click_link
-label_description: "`[dropdown_type]_dropdown_frequent_items_list_item`"
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: dev
-product_stage: create
-product_group: group::editor
-milestone: "13.7"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47589
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/code_suggestions_authenticate.yml b/config/events/code_suggestions_authenticate.yml
new file mode 100644
index 00000000000..d5e1c0fd34b
--- /dev/null
+++ b/config/events/code_suggestions_authenticate.yml
@@ -0,0 +1,22 @@
+---
+description: Tracks the number of authentication requests to the `POST /code_suggestions/tokens` API endpoint.
+category: InternalEventTracking
+action: code_suggestions_authenticate
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- user
+product_section: dev
+product_stage: create
+product_group: code_creation
+milestone: "16.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138848
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/i_analytics_dev_ops_adoption.yml b/config/events/i_analytics_dev_ops_adoption.yml
new file mode 100644
index 00000000000..a478ad2064e
--- /dev/null
+++ b/config/events/i_analytics_dev_ops_adoption.yml
@@ -0,0 +1,24 @@
+---
+description: User viewed analytics devops adoption
+category: InternalEventTracking
+action: i_analytics_dev_ops_adoption
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: manage
+product_group: optimize
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131045
+distributions:
+- ee
+- ce
+tiers:
+- premium
+- ultimate
+- free
diff --git a/config/events/i_analytics_dev_ops_score.yml b/config/events/i_analytics_dev_ops_score.yml
new file mode 100644
index 00000000000..c8f75cc8870
--- /dev/null
+++ b/config/events/i_analytics_dev_ops_score.yml
@@ -0,0 +1,24 @@
+---
+description: User visited /admin/dev_ops_reports
+category: InternalEventTracking
+action: i_analytics_dev_ops_score
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: manage
+product_group: optimize
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131045
+distributions:
+- ee
+- ce
+tiers:
+- premium
+- ultimate
+- free
diff --git a/config/events/k8s_api_proxy_requests_unique_users_via_ci_access.yml b/config/events/k8s_api_proxy_requests_unique_users_via_ci_access.yml
new file mode 100644
index 00000000000..78dae78fc30
--- /dev/null
+++ b/config/events/k8s_api_proxy_requests_unique_users_via_ci_access.yml
@@ -0,0 +1,24 @@
+---
+description: Kubernetes API proxy request using the CI/CD Tunnel via CI Access
+category: InternalEventTracking
+action: k8s_api_proxy_requests_unique_users_via_ci_access
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- user
+- project
+- namespace
+product_section: ops
+product_stage: deploy
+product_group: environments
+milestone: "16.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137488
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/k8s_api_proxy_requests_unique_users_via_pat_access.yml b/config/events/k8s_api_proxy_requests_unique_users_via_pat_access.yml
new file mode 100644
index 00000000000..572758f9f44
--- /dev/null
+++ b/config/events/k8s_api_proxy_requests_unique_users_via_pat_access.yml
@@ -0,0 +1,24 @@
+---
+description: Kubernetes API proxy request via Personal Access Token Access
+category: InternalEventTracking
+action: k8s_api_proxy_requests_unique_users_via_pat_access
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- user
+- project
+- namespace
+product_section: ops
+product_stage: deploy
+product_group: environments
+milestone: "16.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137488
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/k8s_api_proxy_requests_unique_users_via_user_access.yml b/config/events/k8s_api_proxy_requests_unique_users_via_user_access.yml
new file mode 100644
index 00000000000..3cd54b0d1c3
--- /dev/null
+++ b/config/events/k8s_api_proxy_requests_unique_users_via_user_access.yml
@@ -0,0 +1,24 @@
+---
+description: Kubernetes API proxy request using the CI/CD Tunnel via User Access
+category: InternalEventTracking
+action: k8s_api_proxy_requests_unique_users_via_user_access
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- user
+- project
+- namespace
+product_section: ops
+product_stage: deploy
+product_group: environments
+milestone: "16.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137488
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/ml_model_created.yml b/config/events/ml_model_created.yml
new file mode 100644
index 00000000000..ba9a4103956
--- /dev/null
+++ b/config/events/ml_model_created.yml
@@ -0,0 +1,24 @@
+---
+description: Tracks the creation of Machine learning models (Ml::Model) through Ml::CreateModelService
+category: InternalEventTracking
+action: model_registry_ml_model_created
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: data-science
+product_stage: modelops
+product_group: mlops
+milestone: "16.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139798
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/ml_model_version_created.yml b/config/events/ml_model_version_created.yml
new file mode 100644
index 00000000000..655ea812aea
--- /dev/null
+++ b/config/events/ml_model_version_created.yml
@@ -0,0 +1,24 @@
+---
+description: Tracks the creation of Machine learning models versions (Ml::ModelVersion) through Ml::CreateModelVersionService
+category: InternalEventTracking
+action: model_registry_ml_model_version_created
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: data-science
+product_stage: modelops
+product_group: mlops
+milestone: "16.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139798
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/perform_completion_worker.yml b/config/events/perform_completion_worker.yml
new file mode 100644
index 00000000000..39fbb88bc24
--- /dev/null
+++ b/config/events/perform_completion_worker.yml
@@ -0,0 +1,21 @@
+---
+description: When a CompletionWorker gets executed to perform an AI request.
+category: Llm::CompletionWorker
+action: perform_completion_worker
+label_description: AI Action that gets performed
+property_description: Request ID to link to other events of the same AI request.
+value_description:
+extra_properties:
+  client:
+    type: string
+identifiers:
+  - user
+product_section: data-science
+product_stage: modelops
+product_group: 'group::ai framework'
+milestone: '16.7'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137913
+distributions:
+  - ee
+tiers:
+  - ultimate
diff --git a/config/events/unique_users_visiting_ci_catalog.yml b/config/events/unique_users_visiting_ci_catalog.yml
new file mode 100644
index 00000000000..f6abc839688
--- /dev/null
+++ b/config/events/unique_users_visiting_ci_catalog.yml
@@ -0,0 +1,24 @@
+---
+description: Unique self managed and .com users visiting CI/CD Catalog page count on monthly and weekly basis.
+category: InternalEventTracking
+action: unique_users_visiting_ci_catalog
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: verify
+product_group: pipeline_authoring
+milestone: "16.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137564
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+events:
+  - name: unique_users_visiting_ci_catalog
+    unique: user.id
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index 3eaf8b2b34d..4391673b360 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -24,7 +24,6 @@
 - build_artifacts
 - capacity_planning
 - cell
-- ci-cd_visibility
 - cloud_connector
 - cloud_native_installation
 - code_quality
@@ -61,6 +60,7 @@
 - error_tracking
 - feature_flags
 - five_minute_production_app
+- fleet_visibility
 - fulfillment_admin_tooling
 - fulfillment_infrastructure
 - fuzz_testing
@@ -86,7 +86,6 @@
 - mlops
 - mobile_devops
 - navigation
-- no_code_automation
 - omnibus_package
 - on_call_schedule_management
 - onboarding
@@ -109,7 +108,6 @@
 - requirements_management
 - review_apps
 - runner
-- runner_fleet
 - runner_saas
 - saas_provisioning
 - sbom
diff --git a/config/feature_flags/development/generate_commit_message_vertex.yml b/config/feature_flags/development/access_rest_chat.yml
index cee53bc7e71..8a280ef3485 100644
--- a/config/feature_flags/development/generate_commit_message_vertex.yml
+++ b/config/feature_flags/development/access_rest_chat.yml
@@ -1,8 +1,8 @@
 ---
-name: generate_commit_message_vertex
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120259
+name: access_rest_chat
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133015
 rollout_issue_url:
-milestone: '16.0'
+milestone: '16.5'
 type: development
-group: group::code review
+group: group::ai framework
 default_enabled: false
diff --git a/config/feature_flags/development/ai_assist_flag.yml b/config/feature_flags/development/ai_assist_flag.yml
index ce8bff8267c..37d159e81da 100644
--- a/config/feature_flags/development/ai_assist_flag.yml
+++ b/config/feature_flags/development/ai_assist_flag.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100500
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378470
 milestone: '15.6'
 type: development
-group: group::incubation
+group: group::ai framework
 default_enabled: false
diff --git a/config/feature_flags/development/ai_ci_config_generator.yml b/config/feature_flags/development/ai_ci_config_generator.yml
deleted file mode 100644
index 51e5f539233..00000000000
--- a/config/feature_flags/development/ai_ci_config_generator.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: ai_ci_config_generator
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120141
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/407799
-milestone: '16.0'
-type: development
-# This is an ai experiment related to the pipeline authoring groups features
-# We use the authors group so the MR label matches for danger
-group: group::pipeline execution
-default_enabled: false
diff --git a/config/feature_flags/development/configure_sentry_in_application_settings.yml b/config/feature_flags/development/always_set_pipeline_failure_reason.yml
index 82b2261994b..fad54828280 100644
--- a/config/feature_flags/development/configure_sentry_in_application_settings.yml
+++ b/config/feature_flags/development/always_set_pipeline_failure_reason.yml
@@ -1,8 +1,8 @@
 ---
-name: configure_sentry_in_application_settings
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73381
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344832
-milestone: '14.5'
+name: always_set_pipeline_failure_reason
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138390
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434228
+milestone: '16.7'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/approval_group_rules.yml b/config/feature_flags/development/approval_group_rules.yml
new file mode 100644
index 00000000000..c9c5505cefd
--- /dev/null
+++ b/config/feature_flags/development/approval_group_rules.yml
@@ -0,0 +1,8 @@
+---
+name: approval_group_rules
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137268
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432248
+milestone: '16.7'
+type: development
+group: 'group::source code'
+default_enabled: false
diff --git a/config/feature_flags/development/arkose_labs_phone_verification_challenge.yml b/config/feature_flags/development/arkose_labs_phone_verification_challenge.yml
new file mode 100644
index 00000000000..44f273cdc7e
--- /dev/null
+++ b/config/feature_flags/development/arkose_labs_phone_verification_challenge.yml
@@ -0,0 +1,8 @@
+---
+name: arkose_labs_phone_verification_challenge
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137077
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432747
+milestone: '16.7'
+type: development
+group: group::anti-abuse
+default_enabled: false
diff --git a/config/feature_flags/development/create_project_subscription_graphql_endpoint.yml b/config/feature_flags/development/auto_cancel_pipeline_on_job_failure.yml
index a39664a875d..cbf0c518a15 100644
--- a/config/feature_flags/development/create_project_subscription_graphql_endpoint.yml
+++ b/config/feature_flags/development/auto_cancel_pipeline_on_job_failure.yml
@@ -1,8 +1,8 @@
 ---
-name: create_project_subscription_graphql_endpoint
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133308
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429339
-milestone: '16.6'
+name: auto_cancel_pipeline_on_job_failure
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137815
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433163
+milestone: '16.7'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/bitbucket_parallel_importer.yml b/config/feature_flags/development/bitbucket_importer_exponential_backoff.yml
index 6edadec4d3b..310abda55e7 100644
--- a/config/feature_flags/development/bitbucket_parallel_importer.yml
+++ b/config/feature_flags/development/bitbucket_importer_exponential_backoff.yml
@@ -1,8 +1,8 @@
 ---
-name: bitbucket_parallel_importer
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130731
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/423530
-milestone: '16.4'
+name: bitbucket_importer_exponential_backoff
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136842
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432379
+milestone: '16.7'
 type: development
 group: group::import and integrate
 default_enabled: false
diff --git a/config/feature_flags/development/github_importer_raise_max_interruptions.yml b/config/feature_flags/development/bitbucket_server_convert_mentions_to_users.yml
index 3cbcc10865f..90ea8d56c0a 100644
--- a/config/feature_flags/development/github_importer_raise_max_interruptions.yml
+++ b/config/feature_flags/development/bitbucket_server_convert_mentions_to_users.yml
@@ -1,8 +1,8 @@
 ---
-name: github_importer_raise_max_interruptions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134949
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429306
-milestone: '16.6'
+name: bitbucket_server_convert_mentions_to_users
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139097
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434453
+milestone: '16.7'
 type: development
 group: group::import and integrate
 default_enabled: false
diff --git a/config/feature_flags/development/bitbucket_server_importer_exponential_backoff.yml b/config/feature_flags/development/bitbucket_server_importer_exponential_backoff.yml
new file mode 100644
index 00000000000..c167efddf49
--- /dev/null
+++ b/config/feature_flags/development/bitbucket_server_importer_exponential_backoff.yml
@@ -0,0 +1,8 @@
+---
+name: bitbucket_server_importer_exponential_backoff
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137974
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432974
+milestone: '16.7'
+type: development
+group: group::import and integrate
+default_enabled: false
diff --git a/config/feature_flags/development/blob_blame_info.yml b/config/feature_flags/development/blob_blame_info.yml
index 106ceb60cfe..0066fbafc52 100644
--- a/config/feature_flags/development/blob_blame_info.yml
+++ b/config/feature_flags/development/blob_blame_info.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425272
 milestone: '16.5'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/import_fallback_to_db_empty_cache.yml b/config/feature_flags/development/bulk_import_limit_concurrent_batches.yml
index d97adc841fc..4bbd0bd5773 100644
--- a/config/feature_flags/development/import_fallback_to_db_empty_cache.yml
+++ b/config/feature_flags/development/bulk_import_limit_concurrent_batches.yml
@@ -1,8 +1,8 @@
 ---
-name: import_fallback_to_db_empty_cache
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133914
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428700
-milestone: '16.6'
+name: bulk_import_limit_concurrent_batches
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136018
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431561
+milestone: '16.7'
 type: development
 group: group::import and integrate
 default_enabled: false
diff --git a/config/feature_flags/development/bulk_imports_batched_import_export.yml b/config/feature_flags/development/bulk_imports_batched_import_export.yml
index 4afb715b1ee..bf114b6d0a8 100644
--- a/config/feature_flags/development/bulk_imports_batched_import_export.yml
+++ b/config/feature_flags/development/bulk_imports_batched_import_export.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/406559
 milestone: '16.2'
 type: development
 group: group::import and integrate
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/cache_autocomplete_sources_commands.yml b/config/feature_flags/development/cache_autocomplete_sources_commands.yml
new file mode 100644
index 00000000000..ed3e9a8b35a
--- /dev/null
+++ b/config/feature_flags/development/cache_autocomplete_sources_commands.yml
@@ -0,0 +1,8 @@
+---
+name: cache_autocomplete_sources_commands
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138226
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433168
+milestone: '16.7'
+type: development
+group: group::global search
+default_enabled: true
diff --git a/config/feature_flags/development/adherence_report_ui.yml b/config/feature_flags/development/cache_autocomplete_sources_labels.yml
index 7db4fbb756f..fe1e3ffc86c 100644
--- a/config/feature_flags/development/adherence_report_ui.yml
+++ b/config/feature_flags/development/cache_autocomplete_sources_labels.yml
@@ -1,8 +1,8 @@
 ---
-name: adherence_report_ui
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122374
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/414495
-milestone: '16.1'
+name: cache_autocomplete_sources_labels
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138226
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433170
+milestone: '16.7'
 type: development
-group: group::compliance
+group: group::global search
 default_enabled: true
diff --git a/config/feature_flags/development/cache_autocomplete_sources_members.yml b/config/feature_flags/development/cache_autocomplete_sources_members.yml
index c80a7490031..f55c604153a 100644
--- a/config/feature_flags/development/cache_autocomplete_sources_members.yml
+++ b/config/feature_flags/development/cache_autocomplete_sources_members.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427452
 milestone: '16.5'
 type: development
 group: group::global search
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/non_public_artifacts.yml b/config/feature_flags/development/cache_control_headers_for_openid_jwks.yml
index 74826abd7df..79f7a27eeac 100644
--- a/config/feature_flags/development/non_public_artifacts.yml
+++ b/config/feature_flags/development/cache_control_headers_for_openid_jwks.yml
@@ -1,8 +1,8 @@
 ---
-name: non_public_artifacts
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49775
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/294503
-milestone: '13.8'
+name: cache_control_headers_for_openid_jwks
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138405
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433360
+milestone: '16.7'
 type: development
 group: group::pipeline security
-default_enabled: false
+default_enabled: false
\ No newline at end of file
diff --git a/config/feature_flags/development/restrict_pipeline_cancellation_by_role.yml b/config/feature_flags/development/ci_builds_partition_id_query_filter.yml
index 0ef8a5d38db..ab4166c6c93 100644
--- a/config/feature_flags/development/restrict_pipeline_cancellation_by_role.yml
+++ b/config/feature_flags/development/ci_builds_partition_id_query_filter.yml
@@ -1,7 +1,7 @@
 ---
-name: restrict_pipeline_cancellation_by_role
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135047
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429699
+name: ci_builds_partition_id_query_filter
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130073
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431361
 milestone: '16.6'
 type: development
 group: group::pipeline execution
diff --git a/config/feature_flags/development/ci_unlock_non_successful_pipelines.yml b/config/feature_flags/development/ci_catalog_components_tab.yml
index 4cba44f5de4..ad18035a833 100644
--- a/config/feature_flags/development/ci_unlock_non_successful_pipelines.yml
+++ b/config/feature_flags/development/ci_catalog_components_tab.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_unlock_non_successful_pipelines
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134967
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428408
+name: ci_catalog_components_tab
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132764
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426443
 milestone: '16.5'
 type: development
-group: group::pipeline security
+group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/ci_catalog_create_metadata.yml b/config/feature_flags/development/ci_catalog_create_metadata.yml
index a73f499554d..205e7e0c414 100644
--- a/config/feature_flags/development/ci_catalog_create_metadata.yml
+++ b/config/feature_flags/development/ci_catalog_create_metadata.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430120
 milestone: '16.6'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_current_partition_value_101.yml b/config/feature_flags/development/ci_current_partition_value_101.yml
new file mode 100644
index 00000000000..23a4914d759
--- /dev/null
+++ b/config/feature_flags/development/ci_current_partition_value_101.yml
@@ -0,0 +1,8 @@
+---
+name: ci_current_partition_value_101
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136425
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431461
+milestone: '16.7'
+type: development
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/development/ci_guard_for_catalog_resource_scope.yml b/config/feature_flags/development/ci_guard_for_catalog_resource_scope.yml
new file mode 100644
index 00000000000..e6e81690783
--- /dev/null
+++ b/config/feature_flags/development/ci_guard_for_catalog_resource_scope.yml
@@ -0,0 +1,8 @@
+---
+name: ci_guard_for_catalog_resource_scope
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137015
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432219
+milestone: '16.7'
+type: development
+group: group::pipeline authoring
+default_enabled: true
diff --git a/config/feature_flags/development/ci_parallel_remote_includes.yml b/config/feature_flags/development/ci_parallel_remote_includes.yml
new file mode 100644
index 00000000000..c1ac315c224
--- /dev/null
+++ b/config/feature_flags/development/ci_parallel_remote_includes.yml
@@ -0,0 +1,8 @@
+---
+name: ci_parallel_remote_includes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136715
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/413770
+milestone: '16.7'
+type: development
+group: group::pipeline authoring
+default_enabled: false
diff --git a/config/feature_flags/development/ci_redirect_component_project.yml b/config/feature_flags/development/ci_redirect_component_project.yml
new file mode 100644
index 00000000000..205805914a4
--- /dev/null
+++ b/config/feature_flags/development/ci_redirect_component_project.yml
@@ -0,0 +1,8 @@
+---
+name: ci_redirect_component_project
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139254
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434511
+milestone: '16.8'
+type: development
+group: group::pipeline authoring
+default_enabled: false
diff --git a/config/feature_flags/development/ci_retry_on_exit_codes.yml b/config/feature_flags/development/ci_retry_on_exit_codes.yml
new file mode 100644
index 00000000000..eb5f4abb618
--- /dev/null
+++ b/config/feature_flags/development/ci_retry_on_exit_codes.yml
@@ -0,0 +1,8 @@
+---
+name: ci_retry_on_exit_codes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135430
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430037
+milestone: '16.7'
+type: development
+group: group::pipeline authoring
+default_enabled: false
diff --git a/config/feature_flags/development/hide_unaccessible_saml_branches.yml b/config/feature_flags/development/collapse_generated_diff_files.yml
index 27761e0e087..5d5cf5d98a0 100644
--- a/config/feature_flags/development/hide_unaccessible_saml_branches.yml
+++ b/config/feature_flags/development/collapse_generated_diff_files.yml
@@ -1,8 +1,8 @@
 ---
-name: hide_unaccessible_saml_branches
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122972
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/419594
-milestone: '16.2'
+name: collapse_generated_diff_files
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138013
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432670
+milestone: '16.7'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/combined_analytics_visualization_editor.yml b/config/feature_flags/development/combined_analytics_visualization_editor.yml
deleted file mode 100644
index 7d465952c3d..00000000000
--- a/config/feature_flags/development/combined_analytics_visualization_editor.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: combined_analytics_visualization_editor
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131634
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425048
-milestone: '16.4'
-type: development
-group: group::product analytics
-default_enabled: false
diff --git a/config/feature_flags/development/create_personal_ns_outside_model.yml b/config/feature_flags/development/create_personal_ns_outside_model.yml
new file mode 100644
index 00000000000..ba8a3f7deb3
--- /dev/null
+++ b/config/feature_flags/development/create_personal_ns_outside_model.yml
@@ -0,0 +1,8 @@
+---
+name: create_personal_ns_outside_model
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139487
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434921
+milestone: '16.7'
+type: development
+group: group::tenant scale
+default_enabled: false
diff --git a/config/feature_flags/development/custom_emoji.yml b/config/feature_flags/development/custom_emoji.yml
index 64c53c29fdb..8644340d2e6 100644
--- a/config/feature_flags/development/custom_emoji.yml
+++ b/config/feature_flags/development/custom_emoji.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/231317
 milestone: '13.6'
 type: development
 group: group::project management
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/custom_roles_in_members_page.yml b/config/feature_flags/development/custom_roles_in_members_page.yml
deleted file mode 100644
index b7b7b2f6093..00000000000
--- a/config/feature_flags/development/custom_roles_in_members_page.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: custom_roles_in_members_page
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128491
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/422897
-milestone: '16.3'
-type: development
-group: group::authorization
-default_enabled: false
diff --git a/config/feature_flags/development/display_work_item_epic_issue_sidebar.yml b/config/feature_flags/development/display_work_item_epic_issue_sidebar.yml
new file mode 100644
index 00000000000..b981895228a
--- /dev/null
+++ b/config/feature_flags/development/display_work_item_epic_issue_sidebar.yml
@@ -0,0 +1,8 @@
+---
+name: display_work_item_epic_issue_sidebar
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135480
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430337
+milestone: '16.8'
+type: development
+group: group::product planning
+default_enabled: false
diff --git a/config/feature_flags/development/prevent_visibility_restriction.yml b/config/feature_flags/development/duo_chat_callout.yml
index 09b082952c3..c5aed3f2422 100644
--- a/config/feature_flags/development/prevent_visibility_restriction.yml
+++ b/config/feature_flags/development/duo_chat_callout.yml
@@ -1,8 +1,8 @@
 ---
-name: prevent_visibility_restriction
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124649
+name: duo_chat_callout
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138946
 rollout_issue_url:
-milestone: '16.3'
+milestone: '16.7'
 type: development
-group: group::acquisition
+group: group::ai framework
 default_enabled: true
diff --git a/config/feature_flags/development/duo_chat_current_resource_by_default.yml b/config/feature_flags/development/duo_chat_current_resource_by_default.yml
new file mode 100644
index 00000000000..714a59c983c
--- /dev/null
+++ b/config/feature_flags/development/duo_chat_current_resource_by_default.yml
@@ -0,0 +1,8 @@
+---
+name: duo_chat_current_resource_by_default
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138394
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434419
+milestone: '16.7'
+type: development
+group: group::ai framework
+default_enabled: false
diff --git a/config/feature_flags/development/enable_add_on_users_filtering.yml b/config/feature_flags/development/enable_add_on_users_filtering.yml
new file mode 100644
index 00000000000..35ddeac538d
--- /dev/null
+++ b/config/feature_flags/development/enable_add_on_users_filtering.yml
@@ -0,0 +1,8 @@
+---
+name: enable_add_on_users_filtering
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136858
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431365
+milestone: '16.7'
+type: development
+group: group::purchase
+default_enabled: false
diff --git a/config/feature_flags/development/ai_git_command_ff.yml b/config/feature_flags/development/encoding_logs_tree.yml
index 08da04eaf2b..881774f7edb 100644
--- a/config/feature_flags/development/ai_git_command_ff.yml
+++ b/config/feature_flags/development/encoding_logs_tree.yml
@@ -1,8 +1,8 @@
 ---
-name: ai_git_command_ff
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118120
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/408675
-milestone: '16.0'
+name: encoding_logs_tree
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136323
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432559
+milestone: '16.7'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/enforce_acceptance_of_changed_terms.yml b/config/feature_flags/development/enforce_acceptance_of_changed_terms.yml
new file mode 100644
index 00000000000..5864d25bc89
--- /dev/null
+++ b/config/feature_flags/development/enforce_acceptance_of_changed_terms.yml
@@ -0,0 +1,8 @@
+---
+name: enforce_acceptance_of_changed_terms
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136039
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430799
+milestone: '16.7'
+type: development
+group: group::authentication
+default_enabled: false
diff --git a/config/feature_flags/development/replicate_object_pool_on_move.yml b/config/feature_flags/development/enforce_ssh_certificates_via_settings.yml
index e413c8ee56c..e721c2afe8c 100644
--- a/config/feature_flags/development/replicate_object_pool_on_move.yml
+++ b/config/feature_flags/development/enforce_ssh_certificates_via_settings.yml
@@ -1,8 +1,8 @@
 ---
-name: replicate_object_pool_on_move
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127143
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/420720
-milestone: '16.3'
+name: enforce_ssh_certificates_via_settings
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136498
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426235
+milestone: '16.7'
 type: development
 group: group::source code
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/ci_editor_assistant_tool.yml b/config/feature_flags/development/environments_folder_new_look.yml
index 433fae3aed6..218ea2cf448 100644
--- a/config/feature_flags/development/ci_editor_assistant_tool.yml
+++ b/config/feature_flags/development/environments_folder_new_look.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_editor_assistant_tool
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130162
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/423524
-milestone: '16.4'
+name: environments_folder_new_look
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137046
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431928
+milestone: '16.7'
 type: development
 group: group::environments
 default_enabled: false
diff --git a/config/feature_flags/development/ci_stop_unlock_pipelines.yml b/config/feature_flags/development/exclude_protected_variables_from_multi_project_pipeline_triggers.yml
index a7ca6b73b4e..51c840335d3 100644
--- a/config/feature_flags/development/ci_stop_unlock_pipelines.yml
+++ b/config/feature_flags/development/exclude_protected_variables_from_multi_project_pipeline_triggers.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_stop_unlock_pipelines
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134967
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428408
+name: exclude_protected_variables_from_multi_project_pipeline_triggers
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135899
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431266
 milestone: '16.6'
 type: development
 group: group::pipeline security
-default_enabled: false
+default_enabled: false
\ No newline at end of file
diff --git a/config/feature_flags/development/exempt_paid_namespace_members_and_enterprise_users_from_identity_verification.yml b/config/feature_flags/development/exempt_paid_namespace_members_and_enterprise_users_from_identity_verification.yml
new file mode 100644
index 00000000000..497f8004b48
--- /dev/null
+++ b/config/feature_flags/development/exempt_paid_namespace_members_and_enterprise_users_from_identity_verification.yml
@@ -0,0 +1,8 @@
+---
+name: exempt_paid_namespace_members_and_enterprise_users_from_identity_verification
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139101
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434810
+milestone: '16.7'
+type: development
+group: group::anti-abuse
+default_enabled: false
diff --git a/config/feature_flags/development/use_primary_store_as_default_for_db_load_balancing.yml b/config/feature_flags/development/expanded_ai_logging.yml
index 632ec40adfa..4af1606b9a2 100644
--- a/config/feature_flags/development/use_primary_store_as_default_for_db_load_balancing.yml
+++ b/config/feature_flags/development/expanded_ai_logging.yml
@@ -1,8 +1,8 @@
 ---
-name: use_primary_store_as_default_for_db_load_balancing
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111269
+name: expanded_ai_logging
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137689
 rollout_issue_url:
-milestone: '15.9'
+milestone: '16.7'
 type: development
-group: group::scalability
+group: group::ai framework
 default_enabled: false
diff --git a/config/feature_flags/development/frecent_namespaces_suggestions.yml b/config/feature_flags/development/frecent_namespaces_suggestions.yml
deleted file mode 100644
index 1fe0f0694e8..00000000000
--- a/config/feature_flags/development/frecent_namespaces_suggestions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: frecent_namespaces_suggestions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132128
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428362
-milestone: '16.6'
-type: development
-group: group::foundations
-default_enabled: false
diff --git a/config/feature_flags/development/use_repository_list_tags_on_graphql.yml b/config/feature_flags/development/gcp_technical_demo.yml
index 926d952e6f9..98e4529ed33 100644
--- a/config/feature_flags/development/use_repository_list_tags_on_graphql.yml
+++ b/config/feature_flags/development/gcp_technical_demo.yml
@@ -1,8 +1,8 @@
 ---
-name: use_repository_list_tags_on_graphql
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132716
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426358
-milestone: '16.5'
+name: gcp_technical_demo
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139802
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434685
+milestone: '16.7'
 type: development
 group: group::container registry
 default_enabled: false
diff --git a/config/feature_flags/development/github_import_increased_concurrent_workers.yml b/config/feature_flags/development/github_import_increased_concurrent_workers.yml
new file mode 100644
index 00000000000..7e5adaadf62
--- /dev/null
+++ b/config/feature_flags/development/github_import_increased_concurrent_workers.yml
@@ -0,0 +1,8 @@
+---
+name: github_import_increased_concurrent_workers
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137832
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432891
+milestone: '16.7'
+type: development
+group: group::import and integrate
+default_enabled: false
diff --git a/config/feature_flags/development/gitlab_duo_chat_requests_to_ai_gateway.yml b/config/feature_flags/development/gitlab_duo_chat_requests_to_ai_gateway.yml
new file mode 100644
index 00000000000..fc15ee5f1b9
--- /dev/null
+++ b/config/feature_flags/development/gitlab_duo_chat_requests_to_ai_gateway.yml
@@ -0,0 +1,8 @@
+---
+name: gitlab_duo_chat_requests_to_ai_gateway
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138274
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433213
+milestone: '16.7'
+type: development
+group: group::ai framework
+default_enabled: false
diff --git a/config/feature_flags/development/global_ci_catalog.yml b/config/feature_flags/development/global_ci_catalog.yml
deleted file mode 100644
index cf61406112b..00000000000
--- a/config/feature_flags/development/global_ci_catalog.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: global_ci_catalog 
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133885
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427940 
-milestone: '16.6'
-type: development
-group: group::pipeline authoring 
-default_enabled: false
diff --git a/config/feature_flags/development/global_dependency_scanning_on_advisory_ingestion.yml b/config/feature_flags/development/global_dependency_scanning_on_advisory_ingestion.yml
deleted file mode 100644
index ca33869fd2a..00000000000
--- a/config/feature_flags/development/global_dependency_scanning_on_advisory_ingestion.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: global_dependency_scanning_on_advisory_ingestion
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135581
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427424
-milestone: '16.6'
-type: development
-group: group::composition analysis
-default_enabled: false
diff --git a/config/feature_flags/development/graphql_git_blame.yml b/config/feature_flags/development/graphql_git_blame.yml
index c6aad748ef8..1f7a187f6f1 100644
--- a/config/feature_flags/development/graphql_git_blame.yml
+++ b/config/feature_flags/development/graphql_git_blame.yml
@@ -2,7 +2,7 @@
 name: graphql_git_blame
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128103
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/419808
-milestone: "16.3"
+milestone: '16.3'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/explain_vulnerability.yml b/config/feature_flags/development/group_level_vulnerability_report_grouping.yml
index 0b0b6f6dfb4..163d46f6b62 100644
--- a/config/feature_flags/development/explain_vulnerability.yml
+++ b/config/feature_flags/development/group_level_vulnerability_report_grouping.yml
@@ -1,8 +1,8 @@
 ---
-name: explain_vulnerability
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117472
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/407282
-milestone: '15.11'
+name: group_level_vulnerability_report_grouping
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137778
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432778
+milestone: '16.7'
 type: development
 group: group::threat insights
 default_enabled: false
diff --git a/config/feature_flags/development/ipynbdiff_notes_tracker.yml b/config/feature_flags/development/group_user_saml.yml
index af471a3f6ee..f3a03aad18f 100644
--- a/config/feature_flags/development/ipynbdiff_notes_tracker.yml
+++ b/config/feature_flags/development/group_user_saml.yml
@@ -1,8 +1,8 @@
 ---
-name: ipynbdiff_notes_tracker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85398
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362232
-milestone: '15.0'
+name: group_user_saml
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138075
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434464
+milestone: '16.7'
 type: development
-group: group::incubation
+group: group::authentication
 default_enabled: false
diff --git a/config/feature_flags/development/highlight_js_worker.yml b/config/feature_flags/development/highlight_js_worker.yml
index ee74cbb7004..7086ace38e6 100644
--- a/config/feature_flags/development/highlight_js_worker.yml
+++ b/config/feature_flags/development/highlight_js_worker.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415755
 milestone: '16.2'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/internal_events_for_product_analytics.yml b/config/feature_flags/development/internal_events_for_product_analytics.yml
new file mode 100644
index 00000000000..0ed4f0cf744
--- /dev/null
+++ b/config/feature_flags/development/internal_events_for_product_analytics.yml
@@ -0,0 +1,8 @@
+---
+name: internal_events_for_product_analytics
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136154
+rollout_issue_url: 
+milestone: '16.7'
+type: development
+group: group::analytics instrumentation
+default_enabled: false
diff --git a/config/feature_flags/development/issue_email_participants.yml b/config/feature_flags/development/issue_email_participants.yml
index b5ebb9d8c13..97b8e97116b 100644
--- a/config/feature_flags/development/issue_email_participants.yml
+++ b/config/feature_flags/development/issue_email_participants.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49264
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350460
 milestone: '13.8'
 type: development
-group: group::product planning
+group: group::respond
 default_enabled: false
diff --git a/config/feature_flags/development/k8s_watch_api.yml b/config/feature_flags/development/k8s_watch_api.yml
index c8aa176538e..ca3cf6e5fae 100644
--- a/config/feature_flags/development/k8s_watch_api.yml
+++ b/config/feature_flags/development/k8s_watch_api.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427762
 milestone: '16.5'
 type: development
 group: group::environments
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/key_contacts_management.yml b/config/feature_flags/development/key_contacts_management.yml
new file mode 100644
index 00000000000..cb74b446b26
--- /dev/null
+++ b/config/feature_flags/development/key_contacts_management.yml
@@ -0,0 +1,8 @@
+---
+name: key_contacts_management
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432400
+rollout_issue_url: https://gitlab.com/gitlab-org/customers-gitlab-com/-/issues/5873
+milestone: '16.7'
+type: development
+group: group::subscription management
+default_enabled: false
diff --git a/config/feature_flags/development/linked_work_items.yml b/config/feature_flags/development/linked_work_items.yml
index 92d15452dc6..f50c796b621 100644
--- a/config/feature_flags/development/linked_work_items.yml
+++ b/config/feature_flags/development/linked_work_items.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/418946
 milestone: '16.3'
 type: development
 group: group::product planning
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/npm_metadata_cache.yml b/config/feature_flags/development/maven_remove_permissions_check_from_finder.yml
index ddd1afa37e6..6fb3eaf05b6 100644
--- a/config/feature_flags/development/npm_metadata_cache.yml
+++ b/config/feature_flags/development/maven_remove_permissions_check_from_finder.yml
@@ -1,8 +1,8 @@
 ---
-name: npm_metadata_cache
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121714
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/393745
-milestone: '16.1'
+name: maven_remove_permissions_check_from_finder
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135494
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430267
+milestone: '16.7'
 type: development
 group: group::package registry
 default_enabled: false
diff --git a/config/feature_flags/development/remove_mr_blocking_constraints.yml b/config/feature_flags/development/merge_blocked_component.yml
index df4631c711d..06687ef9c76 100644
--- a/config/feature_flags/development/remove_mr_blocking_constraints.yml
+++ b/config/feature_flags/development/merge_blocked_component.yml
@@ -1,7 +1,7 @@
 ---
-name: remove_mr_blocking_constraints
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133897
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429428
+name: merge_blocked_component
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136454
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432033
 milestone: '16.6'
 type: development
 group: group::code review
diff --git a/config/feature_flags/development/only_highlight_discussions_requested.yml b/config/feature_flags/development/only_highlight_discussions_requested.yml
deleted file mode 100644
index 8dfb93c33e0..00000000000
--- a/config/feature_flags/development/only_highlight_discussions_requested.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: only_highlight_discussions_requested
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135096
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429489
-milestone: '16.6'
-type: development
-group: group::code review
-default_enabled: false
diff --git a/config/feature_flags/development/mastodon_social_ui.yml b/config/feature_flags/development/optimize_where_full_path_in.yml
index 5e04d8176e4..a47b703a958 100644
--- a/config/feature_flags/development/mastodon_social_ui.yml
+++ b/config/feature_flags/development/optimize_where_full_path_in.yml
@@ -1,8 +1,8 @@
 ---
-name: mastodon_social_ui
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132892
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428163
-milestone: '16.5'
+name: optimize_where_full_path_in
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137886
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432863
+milestone: '16.7'
 type: development
 group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/development/packages_dependency_proxy_containers_scope_check.yml b/config/feature_flags/development/packages_dependency_proxy_containers_scope_check.yml
new file mode 100644
index 00000000000..fc44a407d37
--- /dev/null
+++ b/config/feature_flags/development/packages_dependency_proxy_containers_scope_check.yml
@@ -0,0 +1,8 @@
+---
+name: packages_dependency_proxy_containers_scope_check
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136655
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431386
+milestone: '16.7'
+type: development
+group: group::container registry
+default_enabled: false
diff --git a/config/feature_flags/development/pause_clickhouse_workers_during_migration.yml b/config/feature_flags/development/pause_clickhouse_workers_during_migration.yml
new file mode 100644
index 00000000000..f2a02c95632
--- /dev/null
+++ b/config/feature_flags/development/pause_clickhouse_workers_during_migration.yml
@@ -0,0 +1,8 @@
+---
+name: pause_clickhouse_workers_during_migration
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138166
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433389
+milestone: '16.7'
+type: development
+group: group::runner
+default_enabled: false
diff --git a/config/feature_flags/development/compliance_adherence_report.yml b/config/feature_flags/development/pipeline_stage_set_last_modified.yml
index f67ff7bdec3..2dfaee85811 100644
--- a/config/feature_flags/development/compliance_adherence_report.yml
+++ b/config/feature_flags/development/pipeline_stage_set_last_modified.yml
@@ -1,8 +1,8 @@
 ---
-name: compliance_adherence_report
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124167
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/416988
-milestone: '16.2'
+name: pipeline_stage_set_last_modified
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138499
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433359
+milestone: '16.7'
 type: development
-group: group::compliance
+group: group::global search
 default_enabled: true
diff --git a/config/feature_flags/development/job_log_jump_to_failures.yml b/config/feature_flags/development/pipeline_subscriptions_vue.yml
index 45d11c82fe9..a50dad53436 100644
--- a/config/feature_flags/development/job_log_jump_to_failures.yml
+++ b/config/feature_flags/development/pipeline_subscriptions_vue.yml
@@ -1,8 +1,8 @@
 ---
-name: job_log_jump_to_failures
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91098
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368633
-milestone: '15.3'
+name: pipeline_subscriptions_vue
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139405
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434831
+milestone: '16.7'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/product_analytics_usage_quota.yml b/config/feature_flags/development/product_analytics_beta_optin.yml
index d5807c5b507..f49afc9458d 100644
--- a/config/feature_flags/development/product_analytics_usage_quota.yml
+++ b/config/feature_flags/development/product_analytics_beta_optin.yml
@@ -1,8 +1,8 @@
 ---
-name: product_analytics_usage_quota
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133781
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427838
-milestone: '16.6'
+name: product_analytics_beta_optin
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138469
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433344
+milestone: '16.7'
 type: development
 group: group::product analytics
 default_enabled: false
diff --git a/config/feature_flags/development/combined_analytics_dashboards_editor.yml b/config/feature_flags/development/product_analytics_usage_quota_annual_data.yml
index 29f6e5387c4..9c269f8ce0e 100644
--- a/config/feature_flags/development/combined_analytics_dashboards_editor.yml
+++ b/config/feature_flags/development/product_analytics_usage_quota_annual_data.yml
@@ -1,8 +1,8 @@
 ---
-name: combined_analytics_dashboards_editor
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120609
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/411407
-milestone: '16.0'
+name: product_analytics_usage_quota_annual_data
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136932
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432734
+milestone: '16.7'
 type: development
 group: group::product analytics
 default_enabled: false
diff --git a/config/feature_flags/development/project_overview_reorg.yml b/config/feature_flags/development/project_overview_reorg.yml
new file mode 100644
index 00000000000..994c17aada6
--- /dev/null
+++ b/config/feature_flags/development/project_overview_reorg.yml
@@ -0,0 +1,8 @@
+---
+name: project_overview_reorg
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137025
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432034
+milestone: '16.7'
+type: development
+group: group::ux paper cuts
+default_enabled: false
diff --git a/config/feature_flags/development/project_tool_filter_with_scanner_name.yml b/config/feature_flags/development/project_tool_filter_with_scanner_name.yml
deleted file mode 100644
index c778edeba52..00000000000
--- a/config/feature_flags/development/project_tool_filter_with_scanner_name.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: project_tool_filter_with_scanner_name
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131310
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/424509
-milestone: '16.5'
-type: development
-group: group::threat insights
-default_enabled: false
diff --git a/config/feature_flags/development/prom_metrics_rust.yml b/config/feature_flags/development/prom_metrics_rust.yml
deleted file mode 100644
index 3b4a4e23a08..00000000000
--- a/config/feature_flags/development/prom_metrics_rust.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: prom_metrics_rust
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119005
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409023
-milestone: '16.0'
-type: development
-group: group::gitaly::cluster
-default_enabled: false
diff --git a/config/feature_flags/development/reduce_duplicate_job_key_ttl.yml b/config/feature_flags/development/reduce_duplicate_job_key_ttl.yml
deleted file mode 100644
index a338bc93753..00000000000
--- a/config/feature_flags/development/reduce_duplicate_job_key_ttl.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: reduce_duplicate_job_key_ttl
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135910
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430345
-milestone: '16.6'
-type: development
-group: group::scalability
-default_enabled: false
diff --git a/config/feature_flags/development/refresh_statistics_on_unlink_fork.yml b/config/feature_flags/development/refresh_statistics_on_unlink_fork.yml
new file mode 100644
index 00000000000..e4358224831
--- /dev/null
+++ b/config/feature_flags/development/refresh_statistics_on_unlink_fork.yml
@@ -0,0 +1,8 @@
+---
+name: refresh_statistics_on_unlink_fork
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137197
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432177
+milestone: '16.7'
+type: development
+group: group::utilization
+default_enabled: false
diff --git a/config/feature_flags/development/resolvable_issue_threads.yml b/config/feature_flags/development/resolvable_issue_threads.yml
deleted file mode 100644
index f3c2911ac4c..00000000000
--- a/config/feature_flags/development/resolvable_issue_threads.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: resolvable_issue_threads
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127243
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/419893
-milestone: '16.3'
-type: development
-group: group::project management
-default_enabled: true
diff --git a/config/feature_flags/development/run_pipeline_schedule_worker_with_delay.yml b/config/feature_flags/development/run_pipeline_schedule_worker_with_delay.yml
new file mode 100644
index 00000000000..31d16efb1d3
--- /dev/null
+++ b/config/feature_flags/development/run_pipeline_schedule_worker_with_delay.yml
@@ -0,0 +1,8 @@
+---
+name: run_pipeline_schedule_worker_with_delay
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136992
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431892
+milestone: '16.7'
+type: development
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/development/search_index_all_projects.yml b/config/feature_flags/development/search_index_all_projects.yml
new file mode 100644
index 00000000000..dc4ea2a175d
--- /dev/null
+++ b/config/feature_flags/development/search_index_all_projects.yml
@@ -0,0 +1,8 @@
+---
+name: search_index_all_projects
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134456
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432489
+milestone: '16.7'
+type: development
+group: group::global search
+default_enabled: false
diff --git a/config/feature_flags/development/self_managed_code_suggestions.yml b/config/feature_flags/development/self_managed_code_suggestions.yml
new file mode 100644
index 00000000000..1c0f636bd8b
--- /dev/null
+++ b/config/feature_flags/development/self_managed_code_suggestions.yml
@@ -0,0 +1,8 @@
+---
+name: self_managed_code_suggestions
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138490
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432983
+milestone: '16.7'
+type: development
+group: group::purchase
+default_enabled: false
diff --git a/config/feature_flags/development/service_desk_custom_email.yml b/config/feature_flags/development/service_desk_custom_email.yml
deleted file mode 100644
index c23dd713da1..00000000000
--- a/config/feature_flags/development/service_desk_custom_email.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: service_desk_custom_email
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108017
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329990
-milestone: '15.9'
-type: development
-group: group::incubation
-default_enabled: true
-log_state_changes: true
diff --git a/config/feature_flags/development/single_file_file_by_file.yml b/config/feature_flags/development/single_file_file_by_file.yml
deleted file mode 100644
index bc38cf8afb2..00000000000
--- a/config/feature_flags/development/single_file_file_by_file.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: single_file_file_by_file
-introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111895'
-rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/403571'
-milestone: '15.11'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/skip_validations_during_transitions.yml b/config/feature_flags/development/skip_validations_during_transitions.yml
deleted file mode 100644
index 53cf5f5ee71..00000000000
--- a/config/feature_flags/development/skip_validations_during_transitions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: skip_validations_during_transitions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129848
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/423092
-milestone: '16.4'
-type: development
-group: group::code review
-default_enabled: false
diff --git a/config/feature_flags/development/soft_limit_daily_phone_verifications.yml b/config/feature_flags/development/soft_limit_daily_phone_verifications.yml
new file mode 100644
index 00000000000..d0cc0290f86
--- /dev/null
+++ b/config/feature_flags/development/soft_limit_daily_phone_verifications.yml
@@ -0,0 +1,8 @@
+---
+name: soft_limit_daily_phone_verifications
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138287
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433220
+milestone: '16.7'
+type: development
+group: group::anti-abuse
+default_enabled: false
diff --git a/config/feature_flags/development/api_redirect_moved_projects.yml b/config/feature_flags/development/support_sha256_repositories.yml
index 56c01d3862b..0482c5dd97c 100644
--- a/config/feature_flags/development/api_redirect_moved_projects.yml
+++ b/config/feature_flags/development/support_sha256_repositories.yml
@@ -1,8 +1,8 @@
 ---
-name: api_redirect_moved_projects
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128642
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/421992
-milestone: '16.3'
+name: support_sha256_repositories
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136681
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431864
+milestone: '16.7'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/telesign_intelligence.yml b/config/feature_flags/development/telesign_intelligence.yml
new file mode 100644
index 00000000000..5d824f4025b
--- /dev/null
+++ b/config/feature_flags/development/telesign_intelligence.yml
@@ -0,0 +1,8 @@
+---
+name: telesign_intelligence
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137739
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432757
+milestone: '16.7'
+type: development
+group: group::anti-abuse
+default_enabled: false
diff --git a/config/feature_flags/development/restrict_ci_job_token_for_public_and_internal_projects.yml b/config/feature_flags/development/truncate_ci_merge_request_description.yml
index 31216be0a5c..816632f0da2 100644
--- a/config/feature_flags/development/restrict_ci_job_token_for_public_and_internal_projects.yml
+++ b/config/feature_flags/development/truncate_ci_merge_request_description.yml
@@ -1,8 +1,8 @@
 ---
-name: restrict_ci_job_token_for_public_and_internal_projects
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135263
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/417172
-milestone: '16.6'
+name: truncate_ci_merge_request_description
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139605
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435099
+milestone: '16.7'
 type: development
 group: group::pipeline security
-default_enabled: true
+default_enabled: false
\ No newline at end of file
diff --git a/config/feature_flags/development/updated_ai_powered_features_menu_for_sm.yml b/config/feature_flags/development/updated_ai_powered_features_menu_for_sm.yml
new file mode 100644
index 00000000000..64377eacd5d
--- /dev/null
+++ b/config/feature_flags/development/updated_ai_powered_features_menu_for_sm.yml
@@ -0,0 +1,8 @@
+---
+name: updated_ai_powered_features_menu_for_sm
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138337
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433255
+milestone: '16.7'
+type: development
+group: group::cloud connector
+default_enabled: false
diff --git a/config/feature_flags/development/use_500_page_size_for_contribution_analytics.yml b/config/feature_flags/development/use_500_page_size_for_contribution_analytics.yml
new file mode 100644
index 00000000000..edc696fc9ac
--- /dev/null
+++ b/config/feature_flags/development/use_500_page_size_for_contribution_analytics.yml
@@ -0,0 +1,8 @@
+---
+name: use_500_page_size_for_contribution_analytics
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136724
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431595
+milestone: '16.7'
+type: development
+group: group::optimize
+default_enabled: true
diff --git a/config/feature_flags/development/use_primary_and_secondary_stores_for_db_load_balancing.yml b/config/feature_flags/development/use_primary_and_secondary_stores_for_db_load_balancing.yml
deleted file mode 100644
index 18f060f247d..00000000000
--- a/config/feature_flags/development/use_primary_and_secondary_stores_for_db_load_balancing.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_primary_and_secondary_stores_for_db_load_balancing
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111269
-rollout_issue_url:
-milestone: '15.9'
-type: development
-group: group::scalability
-default_enabled: false
diff --git a/config/feature_flags/development/use_sync_service_token_worker.yml b/config/feature_flags/development/use_sync_service_token_worker.yml
new file mode 100644
index 00000000000..162387468ae
--- /dev/null
+++ b/config/feature_flags/development/use_sync_service_token_worker.yml
@@ -0,0 +1,8 @@
+---
+name: use_sync_service_token_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136078
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431608
+milestone: '16.7'
+type: development
+group: group::cloud connector
+default_enabled: false
diff --git a/config/feature_flags/development/custom_roles_ui_saas.yml b/config/feature_flags/development/user_approval_rules_removal.yml
index 6ad2150f597..96025a8c163 100644
--- a/config/feature_flags/development/custom_roles_ui_saas.yml
+++ b/config/feature_flags/development/user_approval_rules_removal.yml
@@ -1,8 +1,8 @@
 ---
-name: custom_roles_ui_saas
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130089
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/423077
-milestone: '16.4'
+name: user_approval_rules_removal
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138691
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434141
+milestone: '16.7'
 type: development
-group: group::authorization
+group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/vsa_predefined_date_ranges.yml b/config/feature_flags/development/vsa_predefined_date_ranges.yml
index 8ef46db72bd..e4a5b503349 100644
--- a/config/feature_flags/development/vsa_predefined_date_ranges.yml
+++ b/config/feature_flags/development/vsa_predefined_date_ranges.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425317
 milestone: '16.5'
 type: development
 group: group::optimize
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/wait_for_clickhouse_workers_during_migration.yml b/config/feature_flags/development/wait_for_clickhouse_workers_during_migration.yml
new file mode 100644
index 00000000000..dc67db6c148
--- /dev/null
+++ b/config/feature_flags/development/wait_for_clickhouse_workers_during_migration.yml
@@ -0,0 +1,8 @@
+---
+name: wait_for_clickhouse_workers_during_migration
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138166
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433389
+milestone: '16.7'
+type: development
+group: group::runner
+default_enabled: false
diff --git a/config/feature_flags/development/code_tasks.yml b/config/feature_flags/development/web_ide_oauth.yml
index fec0e8326f3..fc3132d01b4 100644
--- a/config/feature_flags/development/code_tasks.yml
+++ b/config/feature_flags/development/web_ide_oauth.yml
@@ -1,8 +1,8 @@
 ---
-name: code_tasks
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135717
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430962
-milestone: '16.6'
+name: web_ide_oauth
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138015
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433324
+milestone: '16.7'
 type: development
-group: group::code creation
+group: group::ide
 default_enabled: false
diff --git a/config/feature_flags/development/widget_pipeline_pass_subscription_update.yml b/config/feature_flags/development/widget_pipeline_pass_subscription_update.yml
deleted file mode 100644
index 764b0a59291..00000000000
--- a/config/feature_flags/development/widget_pipeline_pass_subscription_update.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: widget_pipeline_pass_subscription_update
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132353
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428633
-milestone: '16.6'
-type: development
-group: group::code review
-default_enabled: false
diff --git a/config/feature_flags/experiment/skip_conflict_files_in_gitaly.yml b/config/feature_flags/experiment/promote_ultimate_features.yml
index 30bc47d5a4e..5035748401b 100644
--- a/config/feature_flags/experiment/skip_conflict_files_in_gitaly.yml
+++ b/config/feature_flags/experiment/promote_ultimate_features.yml
@@ -1,8 +1,8 @@
 ---
-name: skip_conflict_files_in_gitaly
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126191
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/418139
-milestone: '16.3'
+name: promote_ultimate_features
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136199
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430868
+milestone: '16.7'
 type: experiment
-group: group::code review
+group: group::activation
 default_enabled: false
diff --git a/config/feature_flags/experiment/use_cloud_connector_lb.yml b/config/feature_flags/experiment/use_cloud_connector_lb.yml
new file mode 100644
index 00000000000..e77c333d214
--- /dev/null
+++ b/config/feature_flags/experiment/use_cloud_connector_lb.yml
@@ -0,0 +1,8 @@
+---
+name: use_cloud_connector_lb
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139265
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435142
+milestone: '16.8'
+type: experiment
+group: group::cloud connector
+default_enabled: false
diff --git a/config/feature_flags/ops/enforce_memory_watchdog.yml b/config/feature_flags/ops/allow_anonymous_searches.yml
index e87e897d223..248beb7c39d 100644
--- a/config/feature_flags/ops/enforce_memory_watchdog.yml
+++ b/config/feature_flags/ops/allow_anonymous_searches.yml
@@ -1,8 +1,8 @@
 ---
-name: enforce_memory_watchdog
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91910
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367534
-milestone: '15.2'
+name: allow_anonymous_searches
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138975
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434218
+milestone: '16.7'
 type: ops
-group: group::cloud connector
+group: group::global search
 default_enabled: true
diff --git a/config/feature_flags/ops/global_search_epics_tab.yml b/config/feature_flags/ops/global_search_epics_tab.yml
index 42067e9ad93..965f77e3133 100644
--- a/config/feature_flags/ops/global_search_epics_tab.yml
+++ b/config/feature_flags/ops/global_search_epics_tab.yml
@@ -5,4 +5,4 @@ rollout_issue_url:
 milestone: '16.5'
 type: ops
 group: group::global search
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/ops/run_clickhouse_migrations_automatically.yml b/config/feature_flags/ops/run_clickhouse_migrations_automatically.yml
new file mode 100644
index 00000000000..f53e528fa21
--- /dev/null
+++ b/config/feature_flags/ops/run_clickhouse_migrations_automatically.yml
@@ -0,0 +1,8 @@
+---
+name: run_clickhouse_migrations_automatically
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138661
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434848
+milestone: '16.7'
+type: ops
+group: group::runner
+default_enabled: true
diff --git a/config/feature_flags/ops/kubernetes_agent_internal_api.yml b/config/feature_flags/ops/skip_autovacuum_health_check_for_ci_builds.yml
index 3f3ca5a4335..85052f76bbe 100644
--- a/config/feature_flags/ops/kubernetes_agent_internal_api.yml
+++ b/config/feature_flags/ops/skip_autovacuum_health_check_for_ci_builds.yml
@@ -1,8 +1,8 @@
 ---
-name: kubernetes_agent_internal_api
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41045
+name: skip_autovacuum_health_check_for_ci_builds
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139976
 rollout_issue_url:
-milestone: '13.4'
+milestone: '16.8'
 type: ops
-group: group::environments
+group: group::database
 default_enabled: true
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 5002e9e24bf..14fb285f4f8 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -485,6 +485,7 @@ production: &base
       enabled: true
       # The location where pages are stored (default: shared/pages).
       # path: shared/pages
+    # namespace_in_path: false # Set to true if you want to enable namespace in the URL path. It requires pages nginx to be enabled.
 
   ## Mattermost
   ## For enabling Add to Mattermost button
@@ -1133,7 +1134,8 @@ production: &base
       #     args: {
       #       client_id: 'YOUR_AUTH0_CLIENT_ID',
       #       client_secret: 'YOUR_AUTH0_CLIENT_SECRET',
-      #       namespace: 'YOUR_AUTH0_DOMAIN' } }
+      #       domain: 'YOUR_AUTH0_DOMAIN',
+      #       scope: 'openid profile email' } }
 
   # FortiAuthenticator settings
   forti_authenticator:
@@ -1190,13 +1192,8 @@ production: &base
 
   ## Repositories settings
   repositories:
-    # Paths where repositories can be stored. Give the canonicalized absolute pathname.
-    # IMPORTANT: None of the path components may be symlink, because
-    # gitlab-shell invokes Dir.pwd inside the repository path and that results
-    # real path not the symlink.
     storages: # You must have at least a `default` storage path.
       default:
-        path: /home/git/repositories/
         gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port).
         # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
 
@@ -1622,7 +1619,8 @@ test:
           args: {
             client_id: 'YOUR_AUTH0_CLIENT_ID',
             client_secret: 'YOUR_AUTH0_CLIENT_SECRET',
-            namespace: 'YOUR_AUTH0_DOMAIN' } }
+            domain: 'YOUR_AUTH0_DOMAIN',
+            scope: 'openid profile email' } }
       - { name: 'salesforce',
           app_id: 'YOUR_CLIENT_ID',
           app_secret: 'YOUR_CLIENT_SECRET'
diff --git a/config/gitlab_loose_foreign_keys.yml b/config/gitlab_loose_foreign_keys.yml
index 38d03638a4b..5fadf699bf5 100644
--- a/config/gitlab_loose_foreign_keys.yml
+++ b/config/gitlab_loose_foreign_keys.yml
@@ -1,4 +1,8 @@
 ---
+abuse_report_assignees:
+  - table: users
+    column: user_id
+    on_delete: async_delete
 application_settings:
   - table: push_rules
     column: push_rule_id
@@ -6,15 +10,9 @@ application_settings:
   - table: users
     column: usage_stats_set_by_user_id
     on_delete: async_nullify
-  - table: namespaces
-    column: instance_administrators_group_id
-    on_delete: async_nullify
   - table: projects
     column: file_template_project_id
     on_delete: async_nullify
-  - table: projects
-    column: instance_administration_project_id
-    on_delete: async_nullify
   - table: namespaces
     column: custom_project_templates_group_id
     on_delete: async_nullify
@@ -219,10 +217,10 @@ deployment_clusters:
   - table: clusters
     column: cluster_id
     on_delete: async_delete
-deployments:
-  - table: clusters
-    column: cluster_id
-    on_delete: async_nullify
+events:
+  - table: users
+    column: author_id
+    on_delete: async_delete
 external_pull_requests:
   - table: projects
     column: project_id
@@ -298,6 +296,10 @@ pages_deployments:
   - table: p_ci_builds
     column: ci_build_id
     on_delete: async_nullify
+project_authorizations:
+  - table: users
+    column: user_id
+    on_delete: async_delete
 projects:
   - table: organizations
     column: organization_id
diff --git a/config/gitleaks.toml b/config/gitleaks.toml
index 24761dfd783..a492b38fdf9 100644
--- a/config/gitleaks.toml
+++ b/config/gitleaks.toml
@@ -12,6 +12,7 @@ path = "/gitleaks.toml"
     "glpat-1234567890abcdefghij",
     # spec/frontend/lib/utils/secret_detection_spec.js
     "glpat-cgyKc1k_AsnEpmP-5fRL",
+    "gldt-cgyKc1k_AsnEpmP-5fRL",
     # spec/frontend/lib/utils/secret_detection_spec.js
     "GlPat-abcdefghijklmnopqrstuvwxyz",
     # doc/development/sec/token_revocation_api.md
diff --git a/config/initializers/00_rails_disable_joins.rb b/config/initializers/00_rails_disable_joins.rb
new file mode 100644
index 00000000000..24305429034
--- /dev/null
+++ b/config/initializers/00_rails_disable_joins.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Extend `disable_joins` to accept Proc
+ActiveRecord::Associations::Association.prepend(GemExtensions::ActiveRecord::ConfigurableDisableJoins)
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 407225f24f0..ade5465f8ea 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -349,6 +349,7 @@ Settings.pages['object_store']      = ObjectStoreSettings.legacy_parse(Settings.
 Settings.pages['local_store'] ||= {}
 Settings.pages['local_store']['path'] = Settings.absolute(Settings.pages['local_store']['path'] || File.join(Settings.shared['path'], "pages"))
 Settings.pages['local_store']['enabled'] = true if Settings.pages['local_store']['enabled'].nil?
+Settings.pages['namespace_in_path'] = false if Settings.pages['namespace_in_path'].nil?
 
 #
 # GitLab documentation
@@ -699,6 +700,9 @@ Settings.cron_jobs['deactivated_pages_deployments_delete_cron_worker']['job_clas
 Settings.cron_jobs['ci_schedule_unlock_pipelines_in_queue_worker'] ||= {}
 Settings.cron_jobs['ci_schedule_unlock_pipelines_in_queue_worker']['cron'] ||= '*/1 * * * *'
 Settings.cron_jobs['ci_schedule_unlock_pipelines_in_queue_worker']['job_class'] = 'Ci::ScheduleUnlockPipelinesInQueueCronWorker'
+Settings.cron_jobs['ci_catalog_resources_process_sync_events_worker'] ||= {}
+Settings.cron_jobs['ci_catalog_resources_process_sync_events_worker']['cron'] ||= '*/1 * * * *'
+Settings.cron_jobs['ci_catalog_resources_process_sync_events_worker']['job_class'] = 'Ci::Catalog::Resources::ProcessSyncEventsWorker'
 
 Gitlab.ee do
   Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker'] ||= {}
@@ -773,9 +777,6 @@ Gitlab.ee do
   Settings.cron_jobs['ldap_sync_worker'] ||= {}
   Settings.cron_jobs['ldap_sync_worker']['cron'] ||= '30 1 * * *'
   Settings.cron_jobs['ldap_sync_worker']['job_class'] = 'LdapSyncWorker'
-  Settings.cron_jobs['open_ai_clear_conversations'] ||= {}
-  Settings.cron_jobs['open_ai_clear_conversations']['cron'] ||= '*/10 * * * *'
-  Settings.cron_jobs['open_ai_clear_conversations']['job_class'] = 'OpenAi::ClearConversationsWorker'
   Settings.cron_jobs['elastic_index_bulk_cron_worker'] ||= {}
   Settings.cron_jobs['elastic_index_bulk_cron_worker']['cron'] ||= '*/1 * * * *'
   Settings.cron_jobs['elastic_index_bulk_cron_worker']['job_class'] ||= 'ElasticIndexBulkCronWorker'
@@ -800,6 +801,9 @@ Gitlab.ee do
   Settings.cron_jobs['sync_seat_link_worker'] ||= {}
   Settings.cron_jobs['sync_seat_link_worker']['cron'] ||= "#{rand(60)} #{rand(3..4)} * * * UTC"
   Settings.cron_jobs['sync_seat_link_worker']['job_class'] = 'SyncSeatLinkWorker'
+  Settings.cron_jobs['sync_service_token_worker'] ||= {}
+  Settings.cron_jobs['sync_service_token_worker']['cron'] ||= "#{rand(60)} #{rand(5..6)} * * * UTC"
+  Settings.cron_jobs['sync_service_token_worker']['job_class'] = '::Ai::SyncServiceTokenWorker'
   Settings.cron_jobs['llm_embedding_gitlab_documentation_create_empty_embeddings_records_worker'] ||= {}
   Settings.cron_jobs['llm_embedding_gitlab_documentation_create_empty_embeddings_records_worker']['cron'] ||= '0 5 * * 1,2,3,4,5'
   Settings.cron_jobs['llm_embedding_gitlab_documentation_create_empty_embeddings_records_worker']['job_class'] ||= 'Llm::Embedding::GitlabDocumentation::CreateEmptyEmbeddingsRecordsWorker'
@@ -872,6 +876,13 @@ Gitlab.ee do
   Settings.cron_jobs['timeout_pending_status_check_responses_worker'] ||= {}
   Settings.cron_jobs['timeout_pending_status_check_responses_worker']['cron'] ||= '*/1 * * * *'
   Settings.cron_jobs['timeout_pending_status_check_responses_worker']['job_class'] = 'ComplianceManagement::TimeoutPendingStatusCheckResponsesWorker'
+  Settings.cron_jobs['click_house_ci_finished_builds_sync_worker'] ||= {}
+  Settings.cron_jobs['click_house_ci_finished_builds_sync_worker']['cron'] ||= '*/3 * * * *'
+  Settings.cron_jobs['click_house_ci_finished_builds_sync_worker']['args'] ||= [1]
+  Settings.cron_jobs['click_house_ci_finished_builds_sync_worker']['job_class'] = 'ClickHouse::CiFinishedBuildsSyncCronWorker'
+  Settings.cron_jobs['gitlab_subscriptions_add_on_purchases_schedule_bulk_refresh_user_assignments_worker'] ||= {}
+  Settings.cron_jobs['gitlab_subscriptions_add_on_purchases_schedule_bulk_refresh_user_assignments_worker']['cron'] ||= "0 */4 * * *"
+  Settings.cron_jobs['gitlab_subscriptions_add_on_purchases_schedule_bulk_refresh_user_assignments_worker']['job_class'] = 'GitlabSubscriptions::AddOnPurchases::ScheduleBulkRefreshUserAssignmentsWorker'
 
   Gitlab.com do
     Settings.cron_jobs['disable_legacy_open_source_license_for_inactive_projects'] ||= {}
@@ -883,16 +894,9 @@ Gitlab.ee do
     Settings.cron_jobs['gitlab_subscriptions_schedule_refresh_seats_worker'] ||= {}
     Settings.cron_jobs['gitlab_subscriptions_schedule_refresh_seats_worker']['cron'] ||= "0 */6 * * *"
     Settings.cron_jobs['gitlab_subscriptions_schedule_refresh_seats_worker']['job_class'] = 'GitlabSubscriptions::ScheduleRefreshSeatsWorker'
-    Settings.cron_jobs['gitlab_subscriptions_add_on_purchases_schedule_bulk_refresh_user_assignments_worker'] ||= {}
-    Settings.cron_jobs['gitlab_subscriptions_add_on_purchases_schedule_bulk_refresh_user_assignments_worker']['cron'] ||= "0 */4 * * *"
-    Settings.cron_jobs['gitlab_subscriptions_add_on_purchases_schedule_bulk_refresh_user_assignments_worker']['job_class'] = 'GitlabSubscriptions::AddOnPurchases::ScheduleBulkRefreshUserAssignmentsWorker'
     Settings.cron_jobs['click_house_events_sync_worker'] ||= {}
     Settings.cron_jobs['click_house_events_sync_worker']['cron'] ||= "*/3 * * * *"
     Settings.cron_jobs['click_house_events_sync_worker']['job_class'] = 'ClickHouse::EventsSyncWorker'
-    Settings.cron_jobs['click_house_ci_finished_builds_sync_worker'] ||= {}
-    Settings.cron_jobs['click_house_ci_finished_builds_sync_worker']['cron'] ||= '*/3 * * * *'
-    Settings.cron_jobs['click_house_ci_finished_builds_sync_worker']['args'] ||= [1]
-    Settings.cron_jobs['click_house_ci_finished_builds_sync_worker']['job_class'] = 'ClickHouse::CiFinishedBuildsSyncCronWorker'
     Settings.cron_jobs['vertex_ai_refresh_access_token_worker'] ||= {}
     Settings.cron_jobs['vertex_ai_refresh_access_token_worker']['cron'] ||= '*/50 * * * *'
     Settings.cron_jobs['vertex_ai_refresh_access_token_worker']['job_class'] = 'Llm::VertexAiAccessTokenRefreshWorker'
@@ -951,6 +955,14 @@ Gitlab.ee do
 end
 
 #
+# Cloud connector
+#
+Gitlab.ee do
+  Settings['cloud_connector'] = {}
+  Settings.cloud_connector['base_url'] ||= ENV['CLOUD_CONNECTOR_BASE_URL'] || 'https://cloud.gitlab.com'
+end
+
+#
 # Zoekt credentials
 #
 Gitlab.ee do
@@ -971,22 +983,10 @@ Settings.repositories.storages.each do |key, storage|
   Settings.repositories.storages[key] = Gitlab::GitalyClient::StorageSettings.new(storage)
 end
 
-#
-# The repository_downloads_path is used to remove outdated repository
-# archives, if someone has it configured incorrectly, and it points
-# to the path where repositories are stored this can cause some
-# data-integrity issue. In this case, we sets it to the default
-# repository_downloads_path value.
-#
-repositories_storages          = Settings.repositories.storages.values
-repository_downloads_path      = Settings.gitlab['repository_downloads_path'].to_s.gsub(%r{/$}, '')
-repository_downloads_full_path = File.expand_path(repository_downloads_path, Settings.gitlab['user_home'])
+repository_downloads_path = Settings.gitlab['repository_downloads_path'].to_s.gsub(%r{/$}, '')
 
-# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1255
-Gitlab::GitalyClient::StorageSettings.allow_disk_access do
-  if repository_downloads_path.blank? || repositories_storages.any? { |rs| [repository_downloads_path, repository_downloads_full_path].include?(rs.legacy_disk_path.gsub(%r{/$}, '')) }
-    Settings.gitlab['repository_downloads_path'] = File.join(Settings.shared['path'], 'cache/archive')
-  end
+if repository_downloads_path.blank?
+  Settings.gitlab['repository_downloads_path'] = File.join(Settings.shared['path'], 'cache/archive')
 end
 
 #
diff --git a/config/initializers/7_redis.rb b/config/initializers/7_redis.rb
index 25c2c6aa11f..040257535f8 100644
--- a/config/initializers/7_redis.rb
+++ b/config/initializers/7_redis.rb
@@ -27,6 +27,8 @@ Redis::Cluster::SlotLoader.prepend(Gitlab::Patch::SlotLoader)
 Redis::Cluster::CommandLoader.prepend(Gitlab::Patch::CommandLoader)
 Redis::Cluster.prepend(Gitlab::Patch::RedisCluster)
 
+ConnectionPool.prepend(Gitlab::Instrumentation::ConnectionPool)
+
 if Gitlab::Redis::Workhorse.params[:cluster].present?
   raise "Do not configure workhorse with a Redis Cluster as pub/sub commands are not cluster-compatible."
 end
@@ -37,5 +39,5 @@ end
 # 2. Rails.cache
 # 3. HTTP clients
 Gitlab::Redis::ALL_CLASSES.each do |redis_instance|
-  redis_instance.with { nil }
+  redis_instance.with { nil } unless redis_instance == Gitlab::Redis::ClusterSharedState
 end
diff --git a/config/initializers/circuitbox.rb b/config/initializers/circuitbox.rb
index 966320265aa..55c06cf868b 100644
--- a/config/initializers/circuitbox.rb
+++ b/config/initializers/circuitbox.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-Gitlab.ee do
-  Circuitbox.configure do |config|
-    config.default_circuit_store = Gitlab::CircuitBreaker::Store.new
-    config.default_notifier = Gitlab::CircuitBreaker::Notifier.new
-  end
+Circuitbox.configure do |config|
+  config.default_circuit_store = Gitlab::CircuitBreaker::Store.new
+  config.default_notifier = Gitlab::CircuitBreaker::Notifier.new
 end
diff --git a/config/initializers/custom_roles.rb b/config/initializers/custom_roles.rb
new file mode 100644
index 00000000000..e2a61655db6
--- /dev/null
+++ b/config/initializers/custom_roles.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+return unless Gitlab.ee?
+
+Gitlab::CustomRoles::Definition.load_abilities!
diff --git a/config/initializers/gitlab_experiment.rb b/config/initializers/gitlab_experiment.rb
index 6d2795caf51..10ae1fa8ff0 100644
--- a/config/initializers/gitlab_experiment.rb
+++ b/config/initializers/gitlab_experiment.rb
@@ -49,7 +49,7 @@ Gitlab::Experiment.configure do |config|
   #
   valid_domains = %w[about.gitlab.com docs.gitlab.com gitlab.com gdk.test localhost]
   config.redirect_url_validator = lambda do |url|
-    Gitlab.com? && (url = URI.parse(url)) && valid_domains.include?(url.host)
+    ApplicationExperiment.available? && (url = URI.parse(url)) && valid_domains.include?(url.host)
   rescue URI::InvalidURIError
     false
   end
@@ -83,19 +83,5 @@ Gitlab::Experiment.configure do |config|
     def deprecated(*args, version:, stack: 0)
       super if Gitlab.dev_or_test_env?
     end
-
-    # Maintain a list of resolved deprecations to ensure that no new uses appear.
-    #
-    # Once a resolved deprecation warning has been added here, any future use will
-    # raise an exception.
-    #
-    ActiveSupport::Deprecation.disallowed_warnings += [
-      # 'Gitlab::Experiment 0.8 (instead use `control`)', # don't use `use`
-      # 'Gitlab::Experiment 0.8 (instead use `candidate`)', # don't use `try`
-      # 'Gitlab::Experiment 0.8 (instead use `variant(:variant_name)`)', # don't use `try(:variant_name)`
-      # 'Gitlab::Experiment 0.8 (instead use `assigned(:candidate)`)', # don't use variant(:variant_name) to assign
-      # 'Gitlab::Experiment 0.8 (instead use `assigned`)', # don't use variant.name to get the assigned variant
-      # 'Gitlab::Experiment 0.8, instead register variants using:', # don't use public `*_behavior` methods
-    ]
   end)
 end
diff --git a/config/initializers/postgres_partitioning.rb b/config/initializers/postgres_partitioning.rb
index 073b487ff73..5086f6f7da2 100644
--- a/config/initializers/postgres_partitioning.rb
+++ b/config/initializers/postgres_partitioning.rb
@@ -9,9 +9,11 @@ Gitlab::Database::Partitioning.register_models(
     Ci::RunnerManagerBuild,
     Ci::JobAnnotation,
     Ci::BuildMetadata,
+    CommitStatus,
     BatchedGitRefUpdates::Deletion,
     Users::ProjectVisit,
-    Users::GroupVisit
+    Users::GroupVisit,
+    Ci::Catalog::Resources::SyncEvent
   ])
 
 if Gitlab.ee?
diff --git a/config/initializers/rspec_profiling.rb b/config/initializers/rspec_profiling.rb
index b0b7ea85cae..5830a3d5af2 100644
--- a/config/initializers/rspec_profiling.rb
+++ b/config/initializers/rspec_profiling.rb
@@ -48,31 +48,46 @@ module RspecProfilingExt
   end
 
   module Run
-    def example_finished(*args)
-      # rubocop:disable Gitlab/ModuleWithInstanceVariables
+    # rubocop:disable Gitlab/ModuleWithInstanceVariables -- patching class which requires setting ivars
+    def example_finished(notification)
+      # If available, use the spec location where (deeply nested) shared examples are used.
+      file, line_number = notification
+        .example
+        .metadata
+        .fetch(:shared_group_inclusion_backtrace)
+        .reverse
+        .lazy
+        .map { |bt| bt.formatted_inclusion_location&.split(':') }
+        .first
+
+      unless file && line_number
+        file = @current_example.file
+        line_number = @current_example.line_number
+      end
+
       collector.insert({
         branch: vcs.branch,
-                         commit_hash: vcs.sha,
-                         date: vcs.time,
-                         file: @current_example.file,
-                         line_number: @current_example.line_number,
-                         description: @current_example.description,
-                         status: @current_example.status,
-                         exception: @current_example.exception,
-                         time: @current_example.time,
-                         query_count: @current_example.query_count,
-                         query_time: @current_example.query_time,
-                         request_count: @current_example.request_count,
-                         request_time: @current_example.request_time,
-                         feature_category: @current_example.feature_category
+        commit_hash: vcs.sha,
+        date: vcs.time,
+        file: file,
+        line_number: line_number,
+        description: @current_example.description,
+        status: @current_example.status,
+        exception: @current_example.exception,
+        time: @current_example.time,
+        query_count: @current_example.query_count,
+        query_time: @current_example.query_time,
+        request_count: @current_example.request_count,
+        request_time: @current_example.request_time,
+        feature_category: @current_example.feature_category
       })
-      # rubocop:enable Gitlab/ModuleWithInstanceVariables
     rescue StandardError => err
-      return if @already_logged_example_finished_error # rubocop:disable Gitlab/ModuleWithInstanceVariables
+      return if @already_logged_example_finished_error
 
       warn "rspec_profiling couldn't collect an example: #{err}. Further warnings suppressed."
-      @already_logged_example_finished_error = true # rubocop:disable Gitlab/ModuleWithInstanceVariables
+      @already_logged_example_finished_error = true
     end
+    # rubocop:enable Gitlab/ModuleWithInstanceVariables
 
     alias_method :example_passed, :example_finished
     alias_method :example_failed, :example_finished
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 9b6a9b17935..8df12671f26 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -85,12 +85,6 @@ Sidekiq.configure_server do |config|
   end
 
   if enable_reliable_fetch?
-    if Gitlab::Utils.to_boolean(ENV['SIDEKIQ_ENABLE_DUAL_NAMESPACE_POLLING'], default: true)
-      # set non-namespaced store for fetcher to poll both namespaced and non-namespaced queues
-      config[:alternative_store] = ::Gitlab::Redis::Queues
-      config[:namespace] = Gitlab::Redis::Queues::SIDEKIQ_NAMESPACE
-    end
-
     config[:semi_reliable_fetch] = enable_semi_reliable_fetch_mode?
     Sidekiq::ReliableFetch.setup_reliable_fetch!(config)
   end
@@ -119,7 +113,6 @@ Sidekiq.configure_client do |config|
   config.client_middleware(&Gitlab::SidekiqMiddleware.client_configurator)
 end
 
-Sidekiq::Scheduled::Enq.prepend Gitlab::Patch::SidekiqScheduledEnq
 Sidekiq::Scheduled::Poller.prepend Gitlab::Patch::SidekiqPoller
 Sidekiq::Cron::Poller.prepend Gitlab::Patch::SidekiqPoller
 Sidekiq::Cron::Poller.prepend Gitlab::Patch::SidekiqCronPoller
diff --git a/config/initializers/wikicloth_ruby_3_patch.rb b/config/initializers/wikicloth_ruby_3_patch.rb
index 24aa1d557c4..04e5b50b7c9 100644
--- a/config/initializers/wikicloth_ruby_3_patch.rb
+++ b/config/initializers/wikicloth_ruby_3_patch.rb
@@ -68,7 +68,6 @@ end
 # rubocop:disable Style/For
 # rubocop:disable Style/SlicingWithRange
 # rubocop:disable Style/GuardClause
-# rubocop:disable Style/ZeroLengthPredicate
 # rubocop:disable Cop/LineBreakAfterGuardClauses
 # rubocop:disable Layout/MultilineHashBraceLayout
 module WikiCloth
@@ -127,7 +126,7 @@ module WikiCloth
             temp = p.split("=")
             if p !~ /=/ && temp.length == 1 && p == params.last
               return p
-            elsif temp.instance_of?(Array) && temp.length > 0
+            elsif temp.instance_of?(Array) && !temp.empty?
               test = temp.first.strip
               default = temp[1..-1].join("=").strip if test == "#default"
               return temp[1..-1].join("=").strip if test == match || (test == "none" && match.blank?)
@@ -267,6 +266,5 @@ end
 # rubocop:enable Style/For
 # rubocop:enable Style/SlicingWithRange
 # rubocop:enable Style/GuardClause
-# rubocop:enable Style/ZeroLengthPredicate
 # rubocop:enable Cop/LineBreakAfterGuardClauses
 # rubocop:enable Layout/MultilineHashBraceLayout
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index ae8eea3bbda..dbbbbf86994 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -81,7 +81,7 @@ en:
       ai_features: Access to API endpoints needed for GitLab Duo features
     scope_desc:
       api:
-        Grants complete read/write access to the API, including all groups and projects, the container registry, and the package registry.
+        Grants complete read/write access to the API, including all groups and projects, the container registry, the dependency proxy, and the package registry.
       read_api:
         Grants read access to the API, including all groups and projects, the container registry, and the package registry.
       read_user:
@@ -116,9 +116,9 @@ en:
         Grants permission to perform Kubernetes API calls using the agent for Kubernetes.
     group_access_token_scope_desc:
       api:
-        Grants complete read and write access to the scoped group and related project API, including the Package Registry.
+        Grants complete read and write access to the scoped group and related project API, including the container registry, the dependency proxy, and the package registry.
       read_api:
-        Grants read access to the scoped group and related project API, including the Package Registry.
+        Grants read access to the scoped group and related project API, including the package registry.
       read_user:
         Grants read-only access to the authenticated user's profile through the /user API endpoint, which includes username, public email, and full name. Also grants access to read-only API endpoints under /users.
       read_repository:
@@ -126,15 +126,15 @@ en:
       write_repository:
         Grants read and write access (pull and push) to all repositories within a group.
       read_registry:
-        Grants read access (pull) to the Container Registry images if any project within a group is private and authorization is required.
+        Grants read access (pull) to the container registry images if any project within a group is private and authorization is required.
       write_registry:
-        Grants write access (push) to the Container Registry.
+        Grants write access (push) to the container registry.
       read_observability:
         Grants read-only access to GitLab Observability.
       write_observability:
         Grants write access to GitLab Observability.
       ai_features:
-        Grants permission to perform API actions for GitLab Duo.
+        Grants permission to perform API actions for GitLab Duo. This scope is designed to work with the GitLab Duo Plugin for JetBrains. For all other extensions, see scope requirements.
       openid:
         Grants permission to authenticate with GitLab using OpenID Connect. Also gives read-only access to the user's profile and group memberships.
       sudo:
@@ -151,7 +151,7 @@ en:
         Grants permission to perform Kubernetes API calls using the agent for Kubernetes in a group.
     project_access_token_scope_desc:
       api:
-        Grants complete read and write access to the scoped project API, including the Package Registry.
+        Grants complete read and write access to the scoped project API, including the container registry, the dependency proxy, and the package registry.
       read_api:
         Grants read access to the scoped project API, including the Package Registry.
       read_repository:
diff --git a/config/metrics/counts_28d/20210201124930_deployments.yml b/config/metrics/counts_28d/20210201124930_deployments.yml
index bf38efedcd3..2d9432c0e0d 100644
--- a/config/metrics/counts_28d/20210201124930_deployments.yml
+++ b/config/metrics/counts_28d/20210201124930_deployments.yml
@@ -21,4 +21,5 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
diff --git a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
index 2e01a7cced1..d56be888031 100644
--- a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
+++ b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - i_analytics_dev_ops_score
diff --git a/config/metrics/counts_28d/20210216175055_merge_requests.yml b/config/metrics/counts_28d/20210216175055_merge_requests.yml
index 9e3f64553f6..d46caf93675 100644
--- a/config/metrics/counts_28d/20210216175055_merge_requests.yml
+++ b/config/metrics/counts_28d/20210216175055_merge_requests.yml
@@ -17,6 +17,7 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
 removed_by_url:
diff --git a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
index 6da19fb6a93..2f0438d580a 100644
--- a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - i_code_review_user_create_mr
@@ -23,5 +22,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175542_ci_builds.yml b/config/metrics/counts_28d/20210216175542_ci_builds.yml
index 3d2777aebea..c95a1e9fad5 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -16,6 +16,7 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "12.9"
 introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
index d91b965765d..cfbcdf9c3ed 100644
--- a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
@@ -16,6 +16,7 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "12.9"
 introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
index 341cc40bba4..dc72934d8ea 100644
--- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
@@ -16,6 +16,7 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "12.9"
 introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
index ed88363f2e4..1aca43b481c 100644
--- a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
@@ -16,6 +16,7 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "12.9"
 introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
index 4cbd7791013..85574876681 100644
--- a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
@@ -21,5 +21,6 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+- customer_health_score
 milestone: "12.9"
 introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216180312_snippets.yml b/config/metrics/counts_28d/20210216180312_snippets.yml
index 7592ab4b461..38099be75ac 100644
--- a/config/metrics/counts_28d/20210216180312_snippets.yml
+++ b/config/metrics/counts_28d/20210216180312_snippets.yml
@@ -17,5 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
index 6953cbc2ce3..618d65d14f8 100644
--- a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
@@ -28,4 +28,5 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
index 08ae78ceb3b..cbf0833df00 100644
--- a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_edit_by_web_ide
diff --git a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
index b9aca413d7c..b224962de67 100644
--- a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
+++ b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
@@ -8,8 +8,7 @@ product_group: source_code
 value_type: number
 status: active
 time_frame: 28d
-data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+data_source: internal_events
 options:
   events:
   - g_edit_by_sfe
@@ -23,5 +22,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
index dc801b5c139..9c165f348ae 100644
--- a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_edit_by_snippet_ide
diff --git a/config/metrics/counts_28d/20210216180814_events.yml b/config/metrics/counts_28d/20210216180814_events.yml
index e30babe377d..d32c6b21000 100644
--- a/config/metrics/counts_28d/20210216180814_events.yml
+++ b/config/metrics/counts_28d/20210216180814_events.yml
@@ -18,4 +18,5 @@ tier:
 - ultimate
 performance_indicator_type:
 - umau
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181050_packages.yml b/config/metrics/counts_28d/20210216181050_packages.yml
index bcfa88f9b6e..4cd3291457c 100644
--- a/config/metrics/counts_28d/20210216181050_packages.yml
+++ b/config/metrics/counts_28d/20210216181050_packages.yml
@@ -17,5 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
index a1e10881251..2ae56078fb3 100644
--- a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
+++ b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181139_issues.yml b/config/metrics/counts_28d/20210216181139_issues.yml
index ffb7a16e611..931a6d2cfc0 100644
--- a/config/metrics/counts_28d/20210216181139_issues.yml
+++ b/config/metrics/counts_28d/20210216181139_issues.yml
@@ -17,5 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
index 302dc04e16a..9a606ec802d 100644
--- a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
+++ b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
index 3169c02624a..650e84cca79 100644
--- a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
@@ -7,7 +7,7 @@ product_section: dev
 product_stage: manage
 product_group: integration
 value_type: number
-status: active
+status: removed
 time_frame: 28d
 data_source: database
 distribution:
@@ -20,3 +20,5 @@ tier:
 performance_indicator_type:
 - customer_health_score
 milestone: "<13.9"
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136484
+milestone_removed: "16.7"
diff --git a/config/metrics/counts_28d/20210216181158_epics.yml b/config/metrics/counts_28d/20210216181158_epics.yml
index d3f6b0805f5..51eca7b3009 100644
--- a/config/metrics/counts_28d/20210216181158_epics.yml
+++ b/config/metrics/counts_28d/20210216181158_epics.yml
@@ -14,5 +14,6 @@ distribution:
 tier:
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
index 66ca4a56ef6..58912c1d72a 100644
--- a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_title_changed
diff --git a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
index 394b6264191..fd79979a24e 100644
--- a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_description_changed
diff --git a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
index 97b0022a4f8..1e7b2c5e65b 100644
--- a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_assignee_changed
diff --git a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
index e0e88ba0c13..5beba665e0e 100644
--- a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_made_confidential
diff --git a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
index bcf7829efc9..b20ae68f126 100644
--- a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
+++ b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_made_visible
diff --git a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
index 1171cf48812..0e6f5fb78df 100644
--- a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_created
diff --git a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
index 31c7889f4e0..08ad3d7644d 100644
--- a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_closed
diff --git a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
index f0db7f63c41..5420a9213b1 100644
--- a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_reopened
diff --git a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
index 1498b8bfe36..793e6a71813 100644
--- a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_label_changed
diff --git a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
index 105c05cf675..6b8a1a91fa0 100644
--- a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_milestone_changed
@@ -23,5 +22,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
index 22dff1fb97f..be3c37585b9 100644
--- a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
+++ b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_cross_referenced
diff --git a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
index 64a5362684a..69461d90a88 100644
--- a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
+++ b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_moved
diff --git a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
index aa9cf1b373f..2145cbf1420 100644
--- a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
+++ b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_related
diff --git a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
index 1ade783a86c..4ee4a48be4d 100644
--- a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
+++ b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_unrelated
diff --git a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
index 2f74e5c02b1..04df5221d5e 100644
--- a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_marked_as_duplicate
diff --git a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
index 3052d347ac3..7472ef1fc13 100644
--- a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_locked
diff --git a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
index 6bbd951b728..8c815c0851e 100644
--- a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_unlocked
diff --git a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
index cb7626f3d6a..075f99170d0 100644
--- a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_designs_added
diff --git a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
index ac5aeca179b..7b5166fe177 100644
--- a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
+++ b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_designs_modified
diff --git a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
index a3c1c8659e7..ac8ae1696e6 100644
--- a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_designs_removed
diff --git a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
index 7215fe72399..3719726cfd8 100644
--- a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_due_date_changed
diff --git a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
index 59f7cf04dc2..7cba6c77a2b 100644
--- a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_time_estimate_changed
diff --git a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
index e83f0c531bf..587b1f58bcb 100644
--- a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_time_spent_changed
diff --git a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
index 9bc1680c659..eae1ca2225e 100644
--- a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_comment_added
diff --git a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
index 1883c7e8c86..2c5338173ac 100644
--- a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_comment_edited
diff --git a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
index ccc547dfe70..2fafdf51764 100644
--- a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_comment_removed
diff --git a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
index bcacebdc77f..9ebe2a6f117 100644
--- a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
+++ b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_cloned
diff --git a/config/metrics/counts_28d/20210216181923_successful_deployments.yml b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
index bed2969b14a..a7b702bbed7 100644
--- a/config/metrics/counts_28d/20210216181923_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
@@ -19,5 +19,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181924_failed_deployments.yml b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
index a11c1be42f2..355669a2580 100644
--- a/config/metrics/counts_28d/20210216181924_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
@@ -19,5 +19,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181935_deployments.yml b/config/metrics/counts_28d/20210216181935_deployments.yml
index 3c2160e9640..ecf3840bd1d 100644
--- a/config/metrics/counts_28d/20210216181935_deployments.yml
+++ b/config/metrics/counts_28d/20210216181935_deployments.yml
@@ -18,4 +18,5 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181939_releases.yml b/config/metrics/counts_28d/20210216181939_releases.yml
index 6818cd31fe8..390c3e913d8 100644
--- a/config/metrics/counts_28d/20210216181939_releases.yml
+++ b/config/metrics/counts_28d/20210216181939_releases.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
index 308b55d9a90..80913319bd6 100644
--- a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
+++ b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
@@ -24,4 +24,5 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182051_protected_branches.yml b/config/metrics/counts_28d/20210216182051_protected_branches.yml
index 8f6589b5c37..36c67780088 100644
--- a/config/metrics/counts_28d/20210216182051_protected_branches.yml
+++ b/config/metrics/counts_28d/20210216182051_protected_branches.yml
@@ -17,5 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
index 4ea6f65de58..40cd24f3e1e 100644
--- a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
+++ b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
@@ -9,6 +9,7 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: database
+instrumentation_class: UniqueUsersAllImportsMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216183730_jira.yml b/config/metrics/counts_28d/20210216183730_jira.yml
index 37c9b9a7b66..590ca4e5f37 100644
--- a/config/metrics/counts_28d/20210216183730_jira.yml
+++ b/config/metrics/counts_28d/20210216183730_jira.yml
@@ -16,7 +16,8 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
 removed_by_url:
 milestone_removed: "<16.4"
diff --git a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
index d01b08ea827..fef381fb775 100644
--- a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
+++ b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
@@ -21,5 +21,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
index 7929ef37d7b..2bc014e55d2 100644
--- a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
@@ -21,3 +21,5 @@ tier:
 - premium
 - ultimate
 milestone: "<13.9"
+performance_indicator_type:
+- customer_health_score
diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
index 97ff6a51c48..35a727f09dc 100755
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
@@ -181,6 +181,7 @@ options:
   - p_ci_templates_terraform_module_base
   - p_ci_templates_terraform_module
   - p_ci_templates_pages_zola
+  - p_ci_templates_diffblue_cover
 distribution:
 - ce
 - ee
@@ -188,6 +189,7 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
 removed_by_url:
diff --git a/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml b/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
index f84d9c7483a..ce90456d60e 100644
--- a/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
@@ -9,9 +9,8 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 28d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 events:
   - name: p_analytics_ci_cd_pipelines
diff --git a/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml b/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
index 6569027515f..b245b964051 100644
--- a/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
+++ b/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
@@ -9,10 +9,10 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 28d
-data_source: redis_hll
+data_source: internal_events
 data_category: operational
-instrumentation_class: RedisHLLMetric
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 events:
   - name: p_analytics_ci_cd_deployment_frequency
     unique: user.id
diff --git a/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml b/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
index 63d1ed5d0c6..538f73ae4c4 100644
--- a/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
+++ b/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
@@ -9,10 +9,10 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 28d
-data_source: redis_hll
+data_source: internal_events
 data_category: operational
-instrumentation_class: RedisHLLMetric
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 events:
   - name: p_analytics_ci_cd_lead_time
     unique: user.id
diff --git a/config/metrics/counts_28d/20220621085114_unique_active_users_monthly.yml b/config/metrics/counts_28d/20220621085114_unique_active_users_monthly.yml
index 06b1cbcc3cc..ac3aede50b2 100644
--- a/config/metrics/counts_28d/20220621085114_unique_active_users_monthly.yml
+++ b/config/metrics/counts_28d/20220621085114_unique_active_users_monthly.yml
@@ -22,3 +22,5 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- customer_health_score
diff --git a/config/metrics/counts_28d/20220825232557_count_user_auth.yml b/config/metrics/counts_28d/20220825232557_count_user_auth.yml
index 7fd9a845130..625973f9851 100644
--- a/config/metrics/counts_28d/20220825232557_count_user_auth.yml
+++ b/config/metrics/counts_28d/20220825232557_count_user_auth.yml
@@ -12,8 +12,6 @@ time_frame: 28d
 data_source: database
 instrumentation_class: CountUserAuthMetric
 data_category: optional
-performance_indicator_type:
-- smau
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml b/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
index c1506710e62..a87de425c4e 100644
--- a/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
+++ b/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108307
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 options:
   events:
diff --git a/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml b/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml
index acc9ae681f3..37c610568ca 100644
--- a/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml
@@ -12,7 +12,8 @@ time_frame: 28d
 data_source: database
 data_category: operational
 instrumentation_class: CountCiInternalPipelinesMetric
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 distribution:
 - ce
 - ee
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 10e0c13e8e3..3c21dc37144 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
@@ -9,12 +9,14 @@ status: active
 milestone: "16.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124147
 time_frame: 28d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 options:
   events:
     - k8s_api_proxy_requests_unique_users_via_ci_access
+events:
+  - name: k8s_api_proxy_requests_unique_users_via_ci_access
+    unique: user.id
 performance_indicator_type: []
 distribution:
 - ce
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 0ffcd3e9c75..2b93e4dc248 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
@@ -9,12 +9,14 @@ status: active
 milestone: "16.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124147
 time_frame: 28d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 options:
   events:
     - k8s_api_proxy_requests_unique_users_via_user_access
+events:
+  - name: k8s_api_proxy_requests_unique_users_via_user_access
+    unique: user.id
 performance_indicator_type: []
 distribution:
 - ce
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 2728c2b28ee..d523bd9a43a 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
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126884
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 distribution:
 - ce
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 1be1b6f2c80..d4ec580116a 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
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127442
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 distribution:
 - ce
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 41274753ae8..b79068c92f4 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
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128821
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 distribution:
 - ce
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 a604a4f1955..7ba8a34253a 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
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128822
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 distribution:
 - ce
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 5f987f91425..c6fb6c75b64 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
@@ -9,12 +9,14 @@ status: active
 milestone: "16.4"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129463
 time_frame: 28d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 options:
   events:
     - k8s_api_proxy_requests_unique_users_via_pat_access
+events:
+  - name: k8s_api_proxy_requests_unique_users_via_pat_access
+    unique: user.id
 performance_indicator_type: []
 distribution:
 - ce
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
new file mode 100644
index 00000000000..521ae02f6c4
--- /dev/null
+++ b/config/metrics/counts_28d/20231116002424_p_ci_templates_diffblue_cover_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_diffblue_cover_monthly
+description: Count of pipelines using the Diffblue Cover template
+product_section: ci
+product_stage: pipeline_authoring
+product_group: pipeline_authoring
+value_type: number
+status: active
+milestone: "16.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137047
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+    - p_ci_templates_diffblue_cover
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 6050662f99c..350ccd5f348 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
@@ -12,7 +12,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132819
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 distribution:
 - ce
 - ee
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
new file mode 100644
index 00000000000..506ea07c7c7
--- /dev/null
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_28d.yml
@@ -0,0 +1,27 @@
+---
+key_path: redis_hll_counters.pipeline_authoring.unique_users_visiting_ci_catalog_monthly
+description: Unique self managed and .com users visiting CI/CD Catalog page monthly count.
+product_section: ops
+product_stage: verify
+product_group: pipeline_authoring
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: "16.7"
+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
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+    - unique_users_visiting_ci_catalog
+events:
+  - name: unique_users_visiting_ci_catalog
+    unique: user.id
diff --git a/config/metrics/counts_28d/count_total_code_suggestions_authenticate_28d.yml b/config/metrics/counts_28d/count_total_code_suggestions_authenticate_28d.yml
new file mode 100644
index 00000000000..e16fdef1e6f
--- /dev/null
+++ b/config/metrics/counts_28d/count_total_code_suggestions_authenticate_28d.yml
@@ -0,0 +1,26 @@
+---
+key_path: count_total_code_suggestions_authenticate_28d
+description: Tracks the number of authentication requests to the `POST /code_suggestions/tokens` API endpoint in the last 28 days.
+product_section: dev
+product_stage: create
+product_group: code_creation
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: "16.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138848
+time_frame: 28d
+data_source: internal_events
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+    - code_suggestions_authenticate
+events:
+  - name: code_suggestions_authenticate
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
new file mode 100644
index 00000000000..1bf0b9df0c7
--- /dev/null
+++ b/config/metrics/counts_28d/count_total_model_registry_ml_model_created_28d.yml
@@ -0,0 +1,26 @@
+---
+key_path: count_total_model_registry_ml_model_created_28d
+description: Tracks the creation of Machine learning models (Ml::Model) through Ml::CreateModelService in the last 28 days.
+product_section: data-science
+product_stage: modelops
+product_group: mlops
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: "16.8"
+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
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+    - model_registry_ml_model_created
+events:
+  - name: model_registry_ml_model_created
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
new file mode 100644
index 00000000000..500f9f118c4
--- /dev/null
+++ b/config/metrics/counts_28d/count_total_model_registry_ml_model_version_created_28d.yml
@@ -0,0 +1,26 @@
+---
+key_path: count_total_model_registry_ml_model_version_created_28d
+description: Tracks the creation of Machine learning models versions (Ml::ModelVersion) through Ml::CreateModelVersionService in the last 28 days.
+product_section: data-science
+product_stage: modelops
+product_group: mlops
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: "16.8"
+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
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+    - model_registry_ml_model_version_created
+events:
+  - name: model_registry_ml_model_version_created
diff --git a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
index 0a02bafbcf8..c956b597606 100644
--- a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
@@ -11,7 +11,6 @@ milestone: "13.6"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_title_changed
diff --git a/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml b/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
index e8356d5395b..ec22a97b025 100644
--- a/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
+++ b/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - i_analytics_dev_ops_score
diff --git a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
index 71a0be2fe13..953f35c14f3 100644
--- a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - i_code_review_user_create_mr
diff --git a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
index 67c06a60d17..a9cd4e5318a 100644
--- a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_edit_by_web_ide
diff --git a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
index a174cfc4588..feb39509973 100644
--- a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
+++ b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
@@ -8,8 +8,7 @@ product_group: source_code
 value_type: number
 status: active
 time_frame: 7d
-data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+data_source: internal_events
 options:
   events:
   - g_edit_by_sfe
diff --git a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
index faaf35cd648..d84a80be1c6 100644
--- a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_edit_by_snippet_ide
diff --git a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
index e8122d51032..3e9f34edca3 100644
--- a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_description_changed
diff --git a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
index a77403bc36c..3882e44df20 100644
--- a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_assignee_changed
diff --git a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
index bae0105a84b..1f52751bfb7 100644
--- a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_made_confidential
diff --git a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
index ea60d6448ad..2744b7606f6 100644
--- a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
+++ b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_made_visible
diff --git a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
index 97c32f8f7ae..ab31bf2ffce 100644
--- a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_created
diff --git a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
index ef4de1fecbc..c0c287a4ed9 100644
--- a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_closed
diff --git a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
index 88c4b06a85c..862572f5df0 100644
--- a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_reopened
diff --git a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
index 7e6fbf1100d..8263186dc9d 100644
--- a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_label_changed
diff --git a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
index 2f22e39d755..3bbe2f09739 100644
--- a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_milestone_changed
diff --git a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
index 3a30243e957..fbbcb98fb2c 100644
--- a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
+++ b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_cross_referenced
diff --git a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
index 0c1d763602a..b306fb7b918 100644
--- a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
+++ b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_moved
diff --git a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
index 968fec1bcb6..f7ef09248a5 100644
--- a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
+++ b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_related
diff --git a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
index 35ef8eeaded..d1c1a641dcc 100644
--- a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
+++ b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_unrelated
diff --git a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
index 9f0bec1398c..314287dcec7 100644
--- a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_marked_as_duplicate
diff --git a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
index 20d04fa08ac..c526b1832b6 100644
--- a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_locked
diff --git a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
index e76cd94222f..eeb2f0f82c3 100644
--- a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_unlocked
diff --git a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
index d283b0e2356..ca03adbb81d 100644
--- a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_designs_added
diff --git a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
index f1a8f436bbf..b463794db4b 100644
--- a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
+++ b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_designs_modified
diff --git a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
index 43ecbbfd127..80ef0b6b93e 100644
--- a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_designs_removed
diff --git a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
index b2b92df10fb..7651406f9ed 100644
--- a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_due_date_changed
diff --git a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
index aab69e960d0..222df5f22ed 100644
--- a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_time_estimate_changed
diff --git a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
index 7cb085d24b4..f9624fa3ae5 100644
--- a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_time_spent_changed
diff --git a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
index fb7ac35af79..34bd0ce8bd3 100644
--- a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_comment_added
diff --git a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
index 7e18898086e..6b92e88144f 100644
--- a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_comment_edited
diff --git a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
index 6fb3f52f47e..fab024466b8 100644
--- a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_comment_removed
diff --git a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
index 545d66aec4f..83d2e618c2d 100644
--- a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
+++ b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_cloned
diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
index 3925f242efc..61fa197656b 100755
--- a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
@@ -182,6 +182,7 @@ options:
   - p_ci_templates_terraform_module_base
   - p_ci_templates_terraform_module
   - p_ci_templates_pages_zola
+  - p_ci_templates_diffblue_cover
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml b/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
index 3fa819ec1d2..ef70bf573e9 100644
--- a/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
+++ b/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
@@ -10,7 +10,6 @@ status: active
 milestone: "13.11"
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - i_analytics_dev_ops_adoption
@@ -24,3 +23,5 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- customer_health_score
diff --git a/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml b/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
index e86741aedb2..507e0819c5f 100644
--- a/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
+++ b/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
@@ -9,9 +9,8 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 7d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 events:
   - name: p_analytics_ci_cd_pipelines
diff --git a/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml b/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
index a7d8d75e23f..728ec39bada 100644
--- a/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
+++ b/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
@@ -6,7 +6,7 @@ product_section: dev
 product_stage: manage
 product_group: optimize
 value_type: number
-status: active
+status: removed
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 7d
@@ -22,3 +22,5 @@ tier:
   - free
   - premium
   - ultimate
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139231
+milestone_removed: '16.7'
diff --git a/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml b/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
index f0bbdcbda62..511d2f9ca2b 100644
--- a/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
+++ b/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
@@ -9,9 +9,8 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 7d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 events:
   - name: p_analytics_ci_cd_deployment_frequency
diff --git a/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml b/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
index d95376e277a..1fee82190a2 100644
--- a/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
+++ b/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
@@ -9,9 +9,8 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 7d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 events:
   - name: p_analytics_ci_cd_lead_time
diff --git a/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
index 20c36d459c3..da73a2b5412 100644
--- a/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
@@ -20,9 +20,7 @@ options:
     - incident_management_timeline_event_created
     - incident_management_timeline_event_edited
     - incident_management_timeline_event_deleted
-performance_indicator_type:
-  - gmau
-  - paid_gmau
+performance_indicator_type: []
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml b/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
index 3466b0a7f50..e0de5e7d2e6 100644
--- a/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
+++ b/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108307
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 options:
   events:
diff --git a/config/metrics/counts_7d/20230620070722_k8s_api_proxy_requests_unique_users_via_ci_access_weekly.yml b/config/metrics/counts_7d/20230620070722_k8s_api_proxy_requests_unique_users_via_ci_access_weekly.yml
index 22580c0cf4a..7345d209e88 100644
--- a/config/metrics/counts_7d/20230620070722_k8s_api_proxy_requests_unique_users_via_ci_access_weekly.yml
+++ b/config/metrics/counts_7d/20230620070722_k8s_api_proxy_requests_unique_users_via_ci_access_weekly.yml
@@ -9,12 +9,14 @@ status: active
 milestone: "16.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124147
 time_frame: 7d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 options:
   events:
     - k8s_api_proxy_requests_unique_users_via_ci_access
+events:
+  - name: k8s_api_proxy_requests_unique_users_via_ci_access
+    unique: user.id
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_weekly.yml b/config/metrics/counts_7d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_weekly.yml
index 35d1fe7346b..2ff0bceef50 100644
--- a/config/metrics/counts_7d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_weekly.yml
+++ b/config/metrics/counts_7d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_weekly.yml
@@ -9,12 +9,14 @@ status: active
 milestone: "16.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124147
 time_frame: 7d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 options:
   events:
     - k8s_api_proxy_requests_unique_users_via_user_access
+events:
+  - name: k8s_api_proxy_requests_unique_users_via_user_access
+    unique: user.id
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20230724140652_i_code_review_saved_replies_create_weekly.yml b/config/metrics/counts_7d/20230724140652_i_code_review_saved_replies_create_weekly.yml
index 29d097fa59e..42c90f75357 100644
--- a/config/metrics/counts_7d/20230724140652_i_code_review_saved_replies_create_weekly.yml
+++ b/config/metrics/counts_7d/20230724140652_i_code_review_saved_replies_create_weekly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126884
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20230725194657_i_code_review_saved_replies_use_weekly.yml b/config/metrics/counts_7d/20230725194657_i_code_review_saved_replies_use_weekly.yml
index 162b26d7b9d..d910be7ffc3 100644
--- a/config/metrics/counts_7d/20230725194657_i_code_review_saved_replies_use_weekly.yml
+++ b/config/metrics/counts_7d/20230725194657_i_code_review_saved_replies_use_weekly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127442
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20230809194743_i_code_review_saved_replies_use_in_mr_weekly.yml b/config/metrics/counts_7d/20230809194743_i_code_review_saved_replies_use_in_mr_weekly.yml
index ea6af631c9f..1ba00ce2a68 100644
--- a/config/metrics/counts_7d/20230809194743_i_code_review_saved_replies_use_in_mr_weekly.yml
+++ b/config/metrics/counts_7d/20230809194743_i_code_review_saved_replies_use_in_mr_weekly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128821
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20230815171559_i_code_review_saved_replies_use_in_other_weekly.yml b/config/metrics/counts_7d/20230815171559_i_code_review_saved_replies_use_in_other_weekly.yml
index d913cbd7fc7..1725e2c7480 100644
--- a/config/metrics/counts_7d/20230815171559_i_code_review_saved_replies_use_in_other_weekly.yml
+++ b/config/metrics/counts_7d/20230815171559_i_code_review_saved_replies_use_in_other_weekly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128822
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_weekly.yml b/config/metrics/counts_7d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_weekly.yml
index 5f3d0dc8912..8048a66f411 100644
--- a/config/metrics/counts_7d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_weekly.yml
+++ b/config/metrics/counts_7d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_weekly.yml
@@ -9,12 +9,14 @@ status: active
 milestone: "16.4"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129463
 time_frame: 7d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 options:
   events:
     - k8s_api_proxy_requests_unique_users_via_pat_access
+events:
+  - name: k8s_api_proxy_requests_unique_users_via_pat_access
+    unique: user.id
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20231116002421_p_ci_templates_diffblue_cover_weekly.yml b/config/metrics/counts_7d/20231116002421_p_ci_templates_diffblue_cover_weekly.yml
new file mode 100644
index 00000000000..b9586f213a5
--- /dev/null
+++ b/config/metrics/counts_7d/20231116002421_p_ci_templates_diffblue_cover_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_diffblue_cover_weekly
+description: Count of pipelines using the Diffblue Cover template
+product_section: ci
+product_stage: pipeline_authoring
+product_group: pipeline_authoring
+value_type: number
+status: active
+milestone: "16.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137047
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+    - p_ci_templates_diffblue_cover
diff --git a/config/metrics/counts_7d/count_distinct_project_id_from_ci_template_included_7d.yml b/config/metrics/counts_7d/count_distinct_project_id_from_ci_template_included_7d.yml
index 4c6be227130..e16de34f970 100644
--- a/config/metrics/counts_7d/count_distinct_project_id_from_ci_template_included_7d.yml
+++ b/config/metrics/counts_7d/count_distinct_project_id_from_ci_template_included_7d.yml
@@ -12,7 +12,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132819
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_7d.yml b/config/metrics/counts_7d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_7d.yml
new file mode 100644
index 00000000000..867c9f75189
--- /dev/null
+++ b/config/metrics/counts_7d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_7d.yml
@@ -0,0 +1,27 @@
+---
+key_path: redis_hll_counters.pipeline_authoring.unique_users_visiting_ci_catalog_weekly
+description: Unique self managed and .com users visiting CI/CD Catalog page weekly count.
+product_section: ops
+product_stage: verify
+product_group: pipeline_authoring
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: "16.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137564
+time_frame: 7d
+data_source: internal_events
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+    - unique_users_visiting_ci_catalog
+events:
+  - name: unique_users_visiting_ci_catalog
+    unique: user.id
diff --git a/config/metrics/counts_7d/count_total_code_suggestions_authenticate_7d.yml b/config/metrics/counts_7d/count_total_code_suggestions_authenticate_7d.yml
new file mode 100644
index 00000000000..285edb002a1
--- /dev/null
+++ b/config/metrics/counts_7d/count_total_code_suggestions_authenticate_7d.yml
@@ -0,0 +1,26 @@
+---
+key_path: count_total_code_suggestions_authenticate_7d
+description: Tracks the number of authentication requests to the `POST /code_suggestions/tokens` API endpoint in the last 7 days.
+product_section: dev
+product_stage: create
+product_group: code_creation
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: "16.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138848
+time_frame: 7d
+data_source: internal_events
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+    - code_suggestions_authenticate
+events:
+  - name: code_suggestions_authenticate
diff --git a/config/metrics/counts_7d/count_total_model_registry_ml_model_created_7d.yml b/config/metrics/counts_7d/count_total_model_registry_ml_model_created_7d.yml
new file mode 100644
index 00000000000..ce42cf61654
--- /dev/null
+++ b/config/metrics/counts_7d/count_total_model_registry_ml_model_created_7d.yml
@@ -0,0 +1,26 @@
+---
+key_path: count_total_model_registry_ml_model_created_7d
+description: Tracks the creation of Machine learning models (Ml::Model) through Ml::CreateModelService in the last 7 days.
+product_section: data-science
+product_stage: modelops
+product_group: mlops
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: "16.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139798
+time_frame: 7d
+data_source: internal_events
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+    - model_registry_ml_model_created
+events:
+  - name: model_registry_ml_model_created
diff --git a/config/metrics/counts_7d/count_total_model_registry_ml_model_version_created_7d.yml b/config/metrics/counts_7d/count_total_model_registry_ml_model_version_created_7d.yml
new file mode 100644
index 00000000000..e4bd8488cbf
--- /dev/null
+++ b/config/metrics/counts_7d/count_total_model_registry_ml_model_version_created_7d.yml
@@ -0,0 +1,26 @@
+---
+key_path: count_total_model_registry_ml_model_version_created_7d
+description: Tracks the creation of Machine learning models versions (Ml::ModelVersion) through Ml::CreateModelVersionService in the last 7 days.
+product_section: data-science
+product_stage: modelops
+product_group: mlops
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: "16.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139798
+time_frame: 7d
+data_source: internal_events
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+    - model_registry_ml_model_version_created
+events:
+  - name: model_registry_ml_model_version_created
diff --git a/config/metrics/counts_all/20210216175039_merge_requests.yml b/config/metrics/counts_all/20210216175039_merge_requests.yml
index a08f20261ce..b9651ed0329 100644
--- a/config/metrics/counts_all/20210216175039_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175039_merge_requests.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
index 9b192fa26a0..fe90390283f 100644
--- a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
+++ b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
@@ -17,5 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175510_ci_builds.yml b/config/metrics/counts_all/20210216175510_ci_builds.yml
index e8ea8707f0f..479df8fcf22 100644
--- a/config/metrics/counts_all/20210216175510_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175510_ci_builds.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
index 773fe5b7844..afdbb64aebc 100644
--- a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
@@ -17,5 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
index b2c70204679..6b830d88d52 100644
--- a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
@@ -13,5 +13,6 @@ distribution:
 - ce
 tier:
 - free
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
index 3b896103527..a4d7c8fe7b1 100644
--- a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175520_ci_runners.yml b/config/metrics/counts_all/20210216175520_ci_runners.yml
index f701a312446..606b8dd147f 100644
--- a/config/metrics/counts_all/20210216175520_ci_runners.yml
+++ b/config/metrics/counts_all/20210216175520_ci_runners.yml
@@ -16,6 +16,7 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
 instrumentation_class: CountCiRunnersMetric
diff --git a/config/metrics/counts_all/20210216175525_ci_builds.yml b/config/metrics/counts_all/20210216175525_ci_builds.yml
index c44a35960c4..8b060470454 100644
--- a/config/metrics/counts_all/20210216175525_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175525_ci_builds.yml
@@ -17,3 +17,5 @@ tier:
 - premium
 - ultimate
 milestone: "<13.9"
+performance_indicator_type:
+- customer_health_score
diff --git a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
index 0e4fee17e6a..218e56109c1 100644
--- a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
index 4a9f00fcb65..7685d13e3d7 100644
--- a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
index 90f7f20bb83..88c8b518cfd 100644
--- a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175943_projects_jira_active.yml b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
index 2c09473aca2..248ec9c32ce 100644
--- a/config/metrics/counts_all/20210216175943_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
index c196d017874..feda686d183 100644
--- a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
+++ b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
@@ -16,7 +16,8 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112571
 milestone_removed: "15.10"
diff --git a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
index c9c85bca415..907eed3b822 100644
--- a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
@@ -19,7 +19,8 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135755
 milestone_removed: "<16.6"
diff --git a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
index ed5a2d297fb..63620640c90 100644
--- a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
+++ b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
@@ -9,6 +9,7 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: UniqueUsersAllImportsMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216181011_projects_with_packages.yml b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
index 434d9989ed4..da869a35fa8 100644
--- a/config/metrics/counts_all/20210216181011_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181102_issues.yml b/config/metrics/counts_all/20210216181102_issues.yml
index ec679b1089f..f10bbe69e95 100644
--- a/config/metrics/counts_all/20210216181102_issues.yml
+++ b/config/metrics/counts_all/20210216181102_issues.yml
@@ -17,5 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
index 015a7c2bbbe..7b89554c2b2 100644
--- a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
@@ -7,7 +7,7 @@ product_section: dev
 product_stage: manage
 product_group: integration
 value_type: number
-status: active
+status: removed
 time_frame: all
 data_source: database
 distribution:
@@ -18,3 +18,5 @@ tier:
 - premium
 - ultimate
 milestone: "<13.9"
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136484
+milestone_removed: "16.7"
diff --git a/config/metrics/counts_all/20210216181249_feature_flags.yml b/config/metrics/counts_all/20210216181249_feature_flags.yml
index 076264f15ac..5100a862f90 100644
--- a/config/metrics/counts_all/20210216181249_feature_flags.yml
+++ b/config/metrics/counts_all/20210216181249_feature_flags.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181254_projects.yml b/config/metrics/counts_all/20210216181254_projects.yml
index 0bd0e783c0a..265f8f394a1 100644
--- a/config/metrics/counts_all/20210216181254_projects.yml
+++ b/config/metrics/counts_all/20210216181254_projects.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181256_todos.yml b/config/metrics/counts_all/20210216181256_todos.yml
index 98fb0df53a5..57614d7f25e 100644
--- a/config/metrics/counts_all/20210216181256_todos.yml
+++ b/config/metrics/counts_all/20210216181256_todos.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181914_environments.yml b/config/metrics/counts_all/20210216181914_environments.yml
index 4ad72578b0e..23291383518 100644
--- a/config/metrics/counts_all/20210216181914_environments.yml
+++ b/config/metrics/counts_all/20210216181914_environments.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182002_remote_mirrors.yml b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
index 0c8103284a3..7f06be1decb 100644
--- a/config/metrics/counts_all/20210216182002_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index 82ad0e12b5f..e37dabb87ee 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -22,5 +22,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182006_source_code_pushes.yml b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
index a6b46fb44a8..a3ad620b8d2 100644
--- a/config/metrics/counts_all/20210216182006_source_code_pushes.yml
+++ b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
@@ -22,5 +22,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
index ffdc4e0cb8a..415f9f8cca6 100644
--- a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
@@ -23,5 +23,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
index 5f58ba81165..538a5a33c9a 100644
--- a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
@@ -23,5 +23,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210514141520_project_imports_total.yml b/config/metrics/counts_all/20210514141520_project_imports_total.yml
index d3462f48afb..1eb380e9716 100644
--- a/config/metrics/counts_all/20210514141520_project_imports_total.yml
+++ b/config/metrics/counts_all/20210514141520_project_imports_total.yml
@@ -19,3 +19,5 @@ tier:
   - free
   - premium
   - ultimate
+performance_indicator_type:
+- customer_health_score
diff --git a/config/metrics/counts_all/20211028210001_projects_shimo_active.yml b/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
index 1deb27f14b1..fdb10ac57f9 100644
--- a/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
@@ -5,7 +5,9 @@ product_section: dev
 product_stage: manage
 product_group: integrations
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136143
+milestone_removed: '16.7'
 milestone: "14.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
 time_frame: all
diff --git a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
index efac7bb2ed7..95e2e7bbe92 100644
--- a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
@@ -5,7 +5,9 @@ product_section: dev
 product_stage: manage
 product_group: integrations
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136143
+milestone_removed: '16.7'
 milestone: "14.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
 time_frame: all
diff --git a/config/metrics/counts_all/20211028210003_instances_shimo_active.yml b/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
index ad5e6b7beb2..fa31fb0a9fc 100644
--- a/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
@@ -5,7 +5,9 @@ product_section: dev
 product_stage: manage
 product_group: integrations
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136143
+milestone_removed: '16.7'
 milestone: "14.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
 time_frame: all
diff --git a/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml b/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
index a2fc5f528fb..e247ccacc0a 100644
--- a/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
@@ -5,7 +5,9 @@ product_section: dev
 product_stage: manage
 product_group: integrations
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136143
+milestone_removed: '16.7'
 milestone: "14.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
 time_frame: all
diff --git a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
index 5be37a39f47..e973871ed22 100644
--- a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
@@ -5,7 +5,9 @@ product_section: dev
 product_stage: manage
 product_group: integrations
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136143
+milestone_removed: '16.7'
 milestone: "14.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
 time_frame: all
diff --git a/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml b/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml
index cf7aab39202..fa5b892e34f 100644
--- a/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml
+++ b/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127442
 time_frame: all
 data_source: internal_events
 data_category: optional
-instrumentation_class: TotalCountMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml b/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml
index ffeb777fc55..ada90084ff4 100644
--- a/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml
+++ b/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126884
 time_frame: all
 data_source: internal_events
 data_category: optional
-instrumentation_class: TotalCountMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml b/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
index 506ad82f4f4..d05bf23dd41 100644
--- a/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
+++ b/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128821
 time_frame: all
 data_source: internal_events
 data_category: optional
-instrumentation_class: TotalCountMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml b/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml
index 83fb5630d16..44e4d4ed7fa 100644
--- a/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml
+++ b/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128822
 time_frame: all
 data_source: internal_events
 data_category: optional
-instrumentation_class: TotalCountMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_all/20231204142552_service_desk_custom_email_enabled.yml b/config/metrics/counts_all/20231204142552_service_desk_custom_email_enabled.yml
new file mode 100644
index 00000000000..d577c3b5b9f
--- /dev/null
+++ b/config/metrics/counts_all/20231204142552_service_desk_custom_email_enabled.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.service_desk_custom_email_enabled
+description: "Number of projects that have Service Desk custom email enabled"
+product_section: seg
+product_stage: service management
+product_group: respond
+value_type: number
+status: active
+milestone: "16.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138662
+time_frame: all
+data_source: database
+data_category: optional
+instrumentation_class: CountServiceDeskCustomEmailEnabledMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/schema/internal_events.json b/config/metrics/schema/internal_events.json
index 75378db054d..d35a2fa22d7 100644
--- a/config/metrics/schema/internal_events.json
+++ b/config/metrics/schema/internal_events.json
@@ -7,100 +7,50 @@
     }
   },
   "then": {
-    "oneOf": [
-      {
+    "properties": {
+      "instrumentation_class": false,
+      "options": {
+        "type": "object",
         "properties": {
-          "instrumentation_class": {
-            "const": "RedisHLLMetric"
-          },
-          "options": {
-            "type": "object",
-            "properties": {
-              "events": {
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              }
-            },
-            "required": [
-              "events"
-            ],
-            "additionalProperties": false
-          },
           "events": {
             "type": "array",
             "items": {
-              "type": "object",
-              "required": [
-                "name",
-                "unique"
-              ],
-              "properties": {
-                "name": {
-                  "type": "string"
-                },
-                "unique": {
-                  "type": "string",
-                  "enum": [
-                    "user.id",
-                    "project.id",
-                    "namespace.id"
-                  ]
-                }
-              },
-              "additionalProperties": false
+              "type": "string"
             }
           }
         },
         "required": [
-          "events",
-          "options",
-          "instrumentation_class"
-        ]
+          "events"
+        ],
+        "additionalProperties": false
       },
-      {
-        "properties": {
-          "instrumentation_class": {
-            "const": "TotalCountMetric"
-          },
-          "options": {
-            "type": "object",
-            "properties": {
-              "events": {
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              }
+      "events": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "required": [
+            "name"
+          ],
+          "properties": {
+            "name": {
+              "type": "string"
             },
-            "required": [
-              "events"
-            ],
-            "additionalProperties": false
-          },
-          "events": {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "required": [
-                "name"
-              ],
-              "properties": {
-                "name": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
+            "unique": {
+              "type": "string",
+              "enum": [
+                "user.id",
+                "project.id",
+                "namespace.id"
+              ]
             }
-          }
-        },
-        "required": [
-          "events",
-          "options",
-          "instrumentation_class"
-        ]
+          },
+          "additionalProperties": false
+        }
       }
+    },
+    "required": [
+      "events",
+      "options"
     ]
   }
 }
diff --git a/config/metrics/schema/redis_hll.json b/config/metrics/schema/redis_hll.json
index 35d520a5833..255a4f89b90 100644
--- a/config/metrics/schema/redis_hll.json
+++ b/config/metrics/schema/redis_hll.json
@@ -32,7 +32,12 @@
         "required": [
           "instrumentation_class",
           "options"
-        ]
+        ],
+        "not": {
+          "required": [
+            "events"
+          ]
+        }
       },
       {
         "properties": {
diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
index 4e035f5bb5a..ccff2e5b472 100644
--- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
@@ -9,6 +9,9 @@ value_type: boolean
 status: active
 time_frame: none
 data_source: system
+instrumentation_class: GitlabSettingsMetric
+options:
+  setting_method: auto_devops_enabled?
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index f7ef96f196d..469ba762cf5 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -9,6 +9,10 @@ value_type: boolean
 status: active
 time_frame: none
 data_source: system
+instrumentation_class: GitlabConfigMetric
+options:
+  config:
+    registry: enabled
 distribution:
 - ee
 - ce
@@ -16,5 +20,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
index 0d3382cfe5a..ac359a9ff7b 100644
--- a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -9,6 +9,10 @@ value_type: boolean
 status: active
 time_frame: none
 data_source: system
+instrumentation_class: GitlabConfigMetric
+options:
+  config:
+    dependency_proxy: enabled
 distribution:
 - ee
 - ce
diff --git a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
index fa645922f92..f1560eb01d1 100644
--- a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -9,6 +9,10 @@ value_type: boolean
 status: active
 time_frame: none
 data_source: system
+instrumentation_class: GitlabConfigMetric
+options:
+  config:
+    gitlab_ci: shared_runners_enabled
 distribution:
 - ce
 - ee
@@ -16,5 +20,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index 0364fb9f6ac..1af899ff7fd 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -9,6 +9,9 @@ value_type: boolean
 status: active
 time_frame: none
 data_source: system
+instrumentation_class: GitlabSettingsMetric
+options:
+  setting_method: gravatar_enabled?
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
index d5f682912f5..59fa6ddfa8d 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -9,6 +9,10 @@ value_type: boolean
 status: active
 time_frame: none
 data_source: system
+instrumentation_class: GitlabConfigMetric
+options:
+  config:
+    ldap: enabled
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
index 6c8b0635471..1e8560ae6fd 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -9,6 +9,10 @@ value_type: boolean
 status: active
 time_frame: none
 data_source: system
+instrumentation_class: GitlabConfigMetric
+options:
+  config:
+    mattermost: enabled
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
index 811202f8515..6d91d61d466 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -9,6 +9,7 @@ value_type: boolean
 status: active
 time_frame: none
 data_source: system
+instrumentation_class: OmniauthEnabledMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210204124912_prometheus_enabled.yml b/config/metrics/settings/20210204124912_prometheus_enabled.yml
index b9f175be23a..d43520b9b62 100644
--- a/config/metrics/settings/20210204124912_prometheus_enabled.yml
+++ b/config/metrics/settings/20210204124912_prometheus_enabled.yml
@@ -9,6 +9,7 @@ value_type: boolean
 status: active
 time_frame: none
 data_source: system
+instrumentation_class: PrometheusEnabledMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
index 7dd5fefa142..dae3e2ac15c 100644
--- a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
+++ b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
@@ -9,6 +9,7 @@ value_type: boolean
 status: active
 time_frame: none
 data_source: system
+instrumentation_class: PrometheusMetricsEnabledMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
index a68569d728e..b85427d8222 100644
--- a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -9,6 +9,7 @@ value_type: boolean
 status: active
 time_frame: none
 data_source: system
+instrumentation_class: ReplyByEmailEnabledMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
index f9e47064771..ae30de3422d 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -9,6 +9,9 @@ value_type: boolean
 status: active
 time_frame: none
 data_source: system
+instrumentation_class: GitlabSettingsMetric
+options:
+  setting_method: allow_signup?
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210204124922_grafana_link_enabled.yml b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
index c80a6c88073..7c1a00eee71 100644
--- a/config/metrics/settings/20210204124922_grafana_link_enabled.yml
+++ b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
@@ -9,6 +9,9 @@ value_type: boolean
 status: active
 time_frame: none
 data_source: system
+instrumentation_class: GitlabSettingsMetric
+options:
+  setting_method: grafana_enabled?
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210216180314_gitpod_enabled.yml b/config/metrics/settings/20210216180314_gitpod_enabled.yml
index 3bd80b5e141..047f41fa9d5 100644
--- a/config/metrics/settings/20210216180314_gitpod_enabled.yml
+++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml
@@ -9,6 +9,9 @@ value_type: boolean
 status: active
 time_frame: none
 data_source: system
+instrumentation_class: GitlabSettingsMetric
+options:
+  setting_method: gitpod_enabled?
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
index f7ed9d04862..97ea6ccc5c5 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/routes.rb b/config/routes.rb
index 80a30372f5a..b433a88f1c5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,6 +6,7 @@ require 'sidekiq/cron/web'
 InitializerConnections.raise_if_new_database_connection do
   Rails.application.routes.draw do
     concern :access_requestable do
+      get :request_access, on: :collection
       post :request_access, on: :collection
       post :approve_access_request, on: :member
     end
@@ -109,7 +110,8 @@ InitializerConnections.raise_if_new_database_connection do
 
       scope module: 'clusters' do
         scope module: 'agents' do
-          get '/kubernetes/:agent_id', to: 'dashboard#show', as: 'kubernetes_dashboard'
+          get '/kubernetes', to: 'dashboard#index', as: 'kubernetes_dashboard_index'
+          get '/kubernetes/:agent_id(/*vueroute)', to: 'dashboard#show', as: 'kubernetes_dashboard'
         end
       end
 
@@ -129,6 +131,7 @@ InitializerConnections.raise_if_new_database_connection do
       scope :ide, as: :ide, format: false do
         get '/', to: 'ide#index'
         get '/project', to: 'ide#index'
+        get '/oauth_redirect', to: 'ide#oauth_redirect'
 
         scope path: 'project/:project_id', as: :project, constraints: { project_id: Gitlab::PathRegex.full_namespace_route_regex } do
           %w[edit tree blob].each do |action|
@@ -210,6 +213,7 @@ InitializerConnections.raise_if_new_database_connection do
 
       draw :snippets
       draw :profile
+      draw :user_settings
 
       post '/mailgun/webhooks' => 'mailgun/webhooks#process_webhook'
 
diff --git a/config/routes/activity_pub.rb b/config/routes/activity_pub.rb
index f400d722e76..a967889a0ad 100644
--- a/config/routes/activity_pub.rb
+++ b/config/routes/activity_pub.rb
@@ -21,6 +21,7 @@ constraints(::Constraints::ActivityPubConstrainer.new) do
             resources :releases, only: :index do
               collection do
                 get 'outbox'
+                post 'inbox'
               end
             end
           end
diff --git a/config/routes/explore.rb b/config/routes/explore.rb
index 36c2432d0cc..4c7ed505679 100644
--- a/config/routes/explore.rb
+++ b/config/routes/explore.rb
@@ -11,7 +11,10 @@ namespace :explore do
   end
 
   resources :groups, only: [:index]
-  resources :catalog, only: [:index, :show], constraints: { id: /\d+/ }
+  scope :catalog do
+    get '/' => 'catalog#index', as: :catalog_index
+    get '/*full_path' => 'catalog#show', as: :catalog
+  end
   resources :snippets, only: [:index]
   root to: 'projects#index'
 end
diff --git a/config/routes/gcp.rb b/config/routes/gcp.rb
new file mode 100644
index 00000000000..b5e7c561782
--- /dev/null
+++ b/config/routes/gcp.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# All routing related to gcp
+# that is already under /-/ scope only
+
+scope format: false do
+  namespace :gcp do
+    namespace :artifact_registry do
+      resources :docker_images, only: :index
+      resources :setup, only: :new
+    end
+  end
+end
diff --git a/config/routes/profile.rb b/config/routes/profile.rb
index 73c8d63b8ec..eed42105db1 100644
--- a/config/routes/profile.rb
+++ b/config/routes/profile.rb
@@ -5,8 +5,8 @@ devise_for :emails, path: 'profile/emails', controllers: { confirmations: :confi
 
 resource :profile, only: [:show, :update] do
   member do
-    get :audit_log
-    get :applications, to: 'oauth/applications#index'
+    get :audit_log, to: redirect('-/user_settings/authentication_log')
+    get :applications, to: redirect('-/user_settings/applications')
 
     put :reset_incoming_email_token
     put :reset_feed_token
@@ -34,12 +34,6 @@ resource :profile, only: [:show, :update] do
       end
     end
 
-    resource :password, only: [:new, :create, :edit, :update] do
-      member do
-        put :reset
-      end
-    end
-
     resource :slack, only: [:edit] do
       member do
         get :slack_link
@@ -61,7 +55,7 @@ resource :profile, only: [:show, :update] do
         put :revoke
       end
     end
-    resources :active_sessions, only: [:index, :destroy]
+
     resources :emails, only: [:index, :create, :destroy] do
       member do
         put :resend_confirmation_instructions
@@ -76,12 +70,6 @@ resource :profile, only: [:show, :update] do
 
     resource :avatar, only: [:destroy]
 
-    resources :personal_access_tokens, only: [:index, :create] do
-      member do
-        put :revoke
-      end
-    end
-
     resource :two_factor_auth, only: [:show, :create, :destroy] do
       member do
         post :codes
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 947ed6b5413..bda8c0e26e0 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -186,6 +186,12 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         end
 
         resources :deploy_keys, constraints: { id: /\d+/ }, only: [:index, :new, :create, :edit, :update] do
+          collection do
+            get :enabled_keys
+            get :available_project_keys
+            get :available_public_keys
+          end
+
           member do
             put :enable
             put :disable
@@ -402,6 +408,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         # its preferable to keep it below all other project routes
         draw :repository
         draw :wiki
+        draw :gcp
 
         namespace :import do
           resource :jira, only: [:show], controller: :jira
@@ -437,10 +444,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        namespace :integrations do
-          resource :shimo, only: [:show]
-        end
-
         get :planning_hierarchy
 
         resources :badges, only: [] do
diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb
index 4108d4675a5..f45139b96b8 100644
--- a/config/routes/uploads.rb
+++ b/config/routes/uploads.rb
@@ -9,7 +9,7 @@ scope path: :uploads do
   # show uploads for models, snippets (notes) available for now
   get '-/system/:model/:id/:secret/:filename',
     to: 'uploads#show',
-    constraints: { model: /personal_snippet|user/, id: /\d+/, filename: %r{[^/]+} }
+    constraints: { model: /personal_snippet|user|abuse_report/, id: /\d+/, filename: %r{[^/]+} }
 
   # show temporary uploads
   get '-/system/temp/:secret/:filename',
@@ -25,12 +25,12 @@ scope path: :uploads do
   # create uploads for models, snippets (notes) available for now
   post ':model',
     to: 'uploads#create',
-    constraints: { model: /personal_snippet|user/, id: /\d+/ },
+    constraints: { model: /personal_snippet|user|abuse_report/, id: /\d+/ },
     as: 'upload'
 
   post ':model/authorize',
     to: 'uploads#authorize',
-    constraints: { model: /personal_snippet|user/ }
+    constraints: { model: /personal_snippet|user|abuse_report/ }
 
   # Alert Metric Images
   get "-/system/:model/:mounted_as/:id/:filename",
@@ -38,11 +38,11 @@ scope path: :uploads do
     constraints: { model: /alert_management_metric_image/, mounted_as: /file/, filename: %r{[^/]+} },
     as: 'alert_metric_image_upload'
 
-  # Abuse Reports Images
+  # screenshots uploaded by users when reporting abuse
   get "-/system/:model/:mounted_as/:id/:filename",
     to: "uploads#show",
     constraints: { model: /abuse_report/, mounted_as: /screenshot/, filename: %r{[^/]+} },
-    as: 'abuse_report_upload'
+    as: 'abuse_report_screenshot'
 end
 
 # Redirect old note attachments path to new uploads path.
diff --git a/config/routes/user_settings.rb b/config/routes/user_settings.rb
new file mode 100644
index 00000000000..e815e29d323
--- /dev/null
+++ b/config/routes/user_settings.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+namespace :user_settings do
+  scope module: 'user_settings' do
+    get :authentication_log
+    get :applications, to: '/oauth/applications#index'
+  end
+  resources :active_sessions, only: [:index, :destroy]
+  resource :password, only: [:new, :create, :edit, :update] do
+    member do
+      put :reset
+    end
+  end
+  resources :personal_access_tokens, only: [:index, :create] do
+    member do
+      put :revoke
+    end
+  end
+end
+
+# Redirect routes till GitLab 17.0 release
+
+resource :profile, only: [] do
+  resources :active_sessions, only: [:destroy], controller: 'user_settings/active_sessions'
+  resources :personal_access_tokens, controller: 'user_settings/personal_access_tokens', only: [] do
+    member do
+      put :revoke
+    end
+  end
+  member do
+    get :active_sessions, to: redirect(path: '-/user_settings/active_sessions')
+    get :personal_access_tokens, to: redirect(path: '-/user_settings/personal_access_tokens')
+  end
+  get 'password/new', to: redirect(path: '-/user_settings/password/new')
+  get "password/edit", to: redirect(path: '-/user_settings/password/edit')
+end
diff --git a/config/routes/well_known.rb b/config/routes/well_known.rb
index 0c48f116da9..89880f98591 100644
--- a/config/routes/well_known.rb
+++ b/config/routes/well_known.rb
@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
-get '/.well-known/change-password', to: redirect('-/profile/password/edit'), status: 302
+get '/.well-known/change-password', to: redirect('-/user_settings/password/edit'), status: 302
+get '/.well-known/security.txt', to: 'well_known#security_txt'
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 210a246978a..65320c3c8ae 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -27,12 +27,16 @@
   - 1
 - - abuse_spam_abuse_events
   - 1
+- - abuse_trust_score
+  - 1
 - - activity_pub
   - 1
 - - adjourned_project_deletion
   - 1
 - - admin_emails
   - 1
+- - ai_store_repository_xray
+  - 1
 - - analytics_code_review_metrics
   - 1
 - - analytics_devops_adoption_create_snapshot
@@ -73,8 +77,6 @@
   - 2
 - - auto_merge
   - 3
-- - automation_execute_rule
-  - 1
 - - background_migration
   - 1
 - - background_migration_ci_database
@@ -127,6 +129,8 @@
   - 1
 - - bitbucket_server_import_stage_import_repository
   - 1
+- - bitbucket_server_import_stage_import_users
+  - 1
 - - bulk_import
   - 1
 - - bulk_imports_entity
@@ -147,6 +151,8 @@
   - 1
 - - bulk_imports_relation_export
   - 1
+- - bulk_imports_transform_references
+  - 1
 - - chaos
   - 2
 - - chat_notification
@@ -163,8 +169,12 @@
   - 1
 - - ci_llm_generate_config
   - 1
+- - ci_low_urgency_cancel_redundant_pipelines
+  - 1
 - - ci_parse_secure_file_metadata
   - 1
+- - ci_runners_export_usage_csv
+  - 1
 - - ci_runners_process_runner_version_update
   - 1
 - - ci_unlock_pipelines_in_queue
@@ -183,6 +193,8 @@
   - 1
 - - compliance_management_pending_status_check
   - 1
+- - compliance_management_standards_adherence_export_mailer
+  - 1
 - - compliance_management_standards_gitlab_at_least_two_approvals
   - 1
 - - compliance_management_standards_gitlab_base
@@ -455,8 +467,12 @@
   - 1
 - - merge_requests_mergeability_check_batch
   - 1
+- - merge_requests_notify_approvers
+  - 1
 - - merge_requests_process_approval_auto_merge
   - 1
+- - merge_requests_remove_user_approval_rules
+  - 1
 - - merge_requests_resolve_todos
   - 1
 - - merge_requests_resolve_todos_after_approval
@@ -507,8 +523,6 @@
   - 1
 - - package_cleanup
   - 1
-- - package_metadata_advisory_scan
-  - 1
 - - package_metadata_global_advisory_scan
   - 1
 - - package_repositories
@@ -517,6 +531,8 @@
   - 1
 - - pages
   - 1
+- - pages_deactivate_mr_deployments
+  - 1
 - - pages_domain_ssl_renewal
   - 1
 - - pages_domain_verification
@@ -657,10 +673,14 @@
   - 1
 - - security_orchestration_configuration_create_bot
   - 1
+- - security_orchestration_configuration_remove_bot
+  - 1
 - - security_orchestration_policy_rule_schedule_namespace
   - 1
 - - security_process_scan_result_policy
   - 1
+- - security_refresh_compliance_framework_security_policies
+  - 1
 - - security_refresh_project_policies
   - 1
 - - security_scan_execution_policies_rule_schedule
@@ -675,6 +695,10 @@
   - 1
 - - security_sync_scan_policies
   - 1
+- - security_unenforceable_policy_rules_notification
+  - 1
+- - security_unenforceable_policy_rules_pipeline_notification
+  - 1
 - - service_desk_email_receiver
   - 2
 - - set_user_status_based_on_user_cap_setting
@@ -717,6 +741,8 @@
   - 1
 - - vulnerabilities_mark_dropped_as_resolved
   - 1
+- - vulnerabilities_remove_all_vulnerabilities
+  - 1
 - - vulnerabilities_statistics_adjustment
   - 1
 - - vulnerabilities_update_namespace_ids_of_vulnerability_reads
diff --git a/config/vite.json b/config/vite.json
index b428b0daec0..178f978687f 100644
--- a/config/vite.json
+++ b/config/vite.json
@@ -1,18 +1,16 @@
 {
   "all": {
     "sourceCodeDir": "app/assets",
+    "watchAdditionalPaths": [
+      "app/graphql/queries",
+      "app/assets",
+      "ee/app/assets",
+      "jh/app/assets",
+      "vendor/assets"
+    ],
     "entrypointsDir": "javascripts/entrypoints",
-    "devServerConnectTimeout": 3
-  },
-  "development": {
-    "autoBuild": true,
+    "port": 3038,
     "publicOutputDir": "vite-dev",
-    "host": "localhost",
-    "port": 3038
-  },
-  "test": {
-    "autoBuild": true,
-    "publicOutputDir": "vite-test",
-    "port": 3037
+    "devServerConnectTimeout": 3
   }
 }
diff --git a/config/vite.rb b/config/vite.rb
new file mode 100644
index 00000000000..23495825b6f
--- /dev/null
+++ b/config/vite.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require 'yaml'
+require_relative '../lib/vite_gdk'
+
+ViteGdk.load_gdk_vite_config
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 2977b1ce712..038595df1bd 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -297,7 +297,6 @@ let shouldExcludeFromCompliling = (modulePath) =>
 // between Vue.js 2 and Vue.js 3 while using built gitlab-ui by default
 if (EXPLICIT_VUE_VERSION) {
   Object.assign(alias, {
-    '@gitlab/ui/scss_to_js': path.join(ROOT_PATH, 'node_modules/@gitlab/ui/scss_to_js'),
     '@gitlab/ui/dist/tokens/js': path.join(ROOT_PATH, 'node_modules/@gitlab/ui/dist/tokens/js'),
     '@gitlab/ui/dist': '@gitlab/ui/src',
     '@gitlab/ui': '@gitlab/ui/src',
@@ -370,8 +369,7 @@ module.exports = {
           {
             loader: 'worker-loader',
             options: {
-              name: '[name].[contenthash:8].worker.js',
-              inline: IS_DEV_SERVER,
+              filename: '[name].[contenthash:8].worker.js',
             },
           },
           'babel-loader',