Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

457 files changed, 1542 insertions, 689 deletions

diff --git a/config/application.rb b/config/application.rb
index d7e16117d53..249db9c6a67 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -262,12 +262,15 @@ module Gitlab
     config.assets.precompile << "page_bundles/alert_management_settings.css"
     config.assets.precompile << "page_bundles/billings.css"
     config.assets.precompile << "page_bundles/boards.css"
+    config.assets.precompile << "page_bundles/branches.css"
     config.assets.precompile << "page_bundles/build.css"
     config.assets.precompile << "page_bundles/ci_status.css"
     config.assets.precompile << "page_bundles/cluster_agents.css"
     config.assets.precompile << "page_bundles/clusters.css"
     config.assets.precompile << "page_bundles/cycle_analytics.css"
+    config.assets.precompile << "page_bundles/dashboard.css"
     config.assets.precompile << "page_bundles/dashboard_projects.css"
+    config.assets.precompile << "page_bundles/design_management.css"
     config.assets.precompile << "page_bundles/dev_ops_reports.css"
     config.assets.precompile << "page_bundles/editor.css"
     config.assets.precompile << "page_bundles/environments.css"
@@ -293,6 +296,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/merge_requests.css"
     config.assets.precompile << "page_bundles/milestone.css"
     config.assets.precompile << "page_bundles/new_namespace.css"
+    config.assets.precompile << "page_bundles/notifications.css"
     config.assets.precompile << "page_bundles/oncall_schedules.css"
     config.assets.precompile << "page_bundles/operations.css"
     config.assets.precompile << "page_bundles/escalation_policies.css"
@@ -418,22 +422,15 @@ module Gitlab
         allow do
           origins '*'
           resource oauth_path,
-            headers: %w(Authorization),
+            # These headers are added as defaults to axios.
+            # See: https://gitlab.com/gitlab-org/gitlab/-/blob/dd1e70d3676891025534dc4a1e89ca9383178fe7/app/assets/javascripts/lib/utils/axios_utils.js#L8)
+            # It's added to declare that this is a XHR request and add the CSRF token without which Rails may reject the request from the frontend.
+            headers: %w(Authorization X-CSRF-Token X-Requested-With),
             credentials: false,
             methods: %i(post options)
         end
       end
 
-      # Cross-origin requests must be enabled to fetch the self-managed application oauth application ID
-      # for the GitLab for Jira app.
-      allow do
-        origins '*'
-        resource '/-/jira_connect/oauth_application_id',
-          headers: :any,
-          methods: %i(get options),
-          credentials: false
-      end
-
       # These are routes from doorkeeper-openid_connect:
       # https://github.com/doorkeeper-gem/doorkeeper-openid_connect#routes
       allow do
@@ -472,6 +469,11 @@ module Gitlab
       g.factory_bot false
     end
 
+    if defined?(FactoryBotRails)
+      config.factory_bot.definition_file_paths << 'ee/spec/factories' if Gitlab.ee?
+      config.factory_bot.definition_file_paths << 'jh/spec/factories' if Gitlab.jh?
+    end
+
     # sprocket-rails adds some precompile assets we actually do not need.
     #
     # It copies all _non_ js and CSS files from the app/assets/ older.
diff --git a/config/audit_events/types/policy_project_updated.yml b/config/audit_events/types/policy_project_updated.yml
new file mode 100644
index 00000000000..6fffc7f6b10
--- /dev/null
+++ b/config/audit_events/types/policy_project_updated.yml
@@ -0,0 +1,8 @@
+name: policy_project_updated
+description: "This event is triggered whenever the security policy project is updated for a project."
+introduced_by_issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/377877"
+introduced_by_mr: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102154"
+milestone: "15.6"
+group: "govern::security policies"
+saved_to_database: true
+streamed: false
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 5e67ed71954..8f266f2660c 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -51,6 +51,10 @@ Rails.application.configure do
   config.autoload_paths.push("#{config.root}/spec/components/previews")
 
   config.lookbook.page_paths = ["#{config.root}/spec/components/docs"]
+  config.lookbook.preview_params_options_eval = true
+  config.lookbook.preview_display_options = {
+    theme: ["light", "dark (alpha)"]
+  }
 
   # Adds additional error checking when serving assets at runtime.
   # Checks for improperly declared sprockets dependencies.
diff --git a/config/events/1658833247_integrations_class_perform_integrations_action.yml b/config/events/1658833247_integrations_class_perform_integrations_action.yml
index 62da809fe14..d8f7cb4d38f 100644
--- a/config/events/1658833247_integrations_class_perform_integrations_action.yml
+++ b/config/events/1658833247_integrations_class_perform_integrations_action.yml
@@ -8,7 +8,7 @@ identifiers:
 - user
 - namespace
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 milestone: "15.3"
@@ -20,4 +20,3 @@ tiers:
 - free
 - premium
 - ultimate
-
diff --git a/config/events/1666038724_Gitlab__Tracking__Helpers__WeakPasswordErrorEvent_track_weak_password_error.yml b/config/events/1666038724_Gitlab__Tracking__Helpers__WeakPasswordErrorEvent_track_weak_password_error.yml
new file mode 100644
index 00000000000..d19db52074b
--- /dev/null
+++ b/config/events/1666038724_Gitlab__Tracking__Helpers__WeakPasswordErrorEvent_track_weak_password_error.yml
@@ -0,0 +1,29 @@
+---
+description: User record is invalid due to weak password
+category: Gitlab::Tracking::Helpers::WeakPasswordErrorEvent
+action: track_weak_password_error
+label_description:
+property_description:
+value_description:
+extra_properties:
+  controller:
+    type: string
+    description: The controller which triggered the weak password check
+  method:
+    type: string
+    description: The method or controller action which triggered the weak password check
+identifiers:
+product_section: dev
+product_stage: manage
+product_group: group::authentication and authorization
+product_category: authentication_and_authorization
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100237
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/202109151015_cluster_services_prometheus_disabled_manual_prometheus.yml b/config/events/202109151015_cluster_services_prometheus_disabled_manual_prometheus.yml
index c98ac8323d4..4181ce723a7 100644
--- a/config/events/202109151015_cluster_services_prometheus_disabled_manual_prometheus.yml
+++ b/config/events/202109151015_cluster_services_prometheus_disabled_manual_prometheus.yml
@@ -7,7 +7,7 @@ value_description:
 extra_properties:
 identifiers:
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: group::integrations
 product_category:
 milestone: "14.0"
diff --git a/config/events/202109151015_cluster_services_prometheus_enabled_manual_prometheus.yml b/config/events/202109151015_cluster_services_prometheus_enabled_manual_prometheus.yml
index c453b2f035c..94e54d59de4 100644
--- a/config/events/202109151015_cluster_services_prometheus_enabled_manual_prometheus.yml
+++ b/config/events/202109151015_cluster_services_prometheus_enabled_manual_prometheus.yml
@@ -7,7 +7,7 @@ value_description:
 extra_properties:
 identifiers:
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: group::integrations
 product_category:
 milestone: "14.0"
diff --git a/config/events/20210915205112_packages_delete_package.yml b/config/events/20210915205112_packages_delete_package.yml
index 568a800a8e6..ebbebd553bf 100644
--- a/config/events/20210915205112_packages_delete_package.yml
+++ b/config/events/20210915205112_packages_delete_package.yml
@@ -7,8 +7,8 @@ value_description: ""
 extra_properties:
 identifiers:
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: manage
+product_group: group::foundations
 product_category:
 milestone: "13.4"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41668
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index 66aa6071502..94a50dc416e 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -17,7 +17,7 @@
 - authentication_and_authorization
 - auto_devops
 - backup_restore
-- billing_and_subscription_management
+- billing_and_payments
 - build
 - build_artifacts
 - chatops
@@ -35,6 +35,7 @@
 - continuous_integration_scaling
 - continuous_verification
 - credential_management
+- customersdot_application
 - database
 - dataops
 - dedicated
@@ -59,7 +60,9 @@
 - experimentation_expansion
 - feature_flags
 - five_minute_production_app
-- fulfillment_platform
+- fulfillment_admin_tooling
+- fulfillment_developer_productivity
+- fulfillment_infrastructure
 - fuzz_testing
 - geo_replication
 - git_lfs
@@ -97,10 +100,8 @@
 - planning_analytics
 - pods
 - portfolio_management
-- privacy_control_center
 - product_analytics
 - projects
-- provision
 - pubsec_services
 - purchase
 - quality_management
@@ -114,6 +115,7 @@
 - runner
 - runner_fleet
 - runner_saas
+- saas_provisioning
 - scalability
 - secret_detection
 - secrets_management
@@ -121,16 +123,19 @@
 - security_policy_management
 - service_desk
 - service_ping
+- sm_provisioning
 - snippets
 - source_code_management
 - static_application_security_testing
 - subgroups
+- subscription_cost_management
+- subscription_management
+- subscription_usage_reports
 - system_access
 - team_planning
 - tracing
 - user_management
 - users
-- utilization
 - value_stream_management
 - vulnerability_management
 - web_ide
diff --git a/config/feature_flags/development/refactor_code_quality_extension.yml b/config/feature_flags/development/actors_aware_gitaly_calls.yml
index c6eb7c19a6e..0ae6140c579 100644
--- a/config/feature_flags/development/refactor_code_quality_extension.yml
+++ b/config/feature_flags/development/actors_aware_gitaly_calls.yml
@@ -1,8 +1,8 @@
 ---
-name: refactor_code_quality_extension
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88865
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363845
-milestone: '15.1'
+name: actors_aware_gitaly_calls
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101218
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381516
+milestone: '15.6'
 type: development
-group: group::secure
+group: group::gitaly
 default_enabled: false
diff --git a/config/feature_flags/development/mergeability_caching.yml b/config/feature_flags/development/add_delete_branch_worker.yml
index b9063299926..b0470a7f901 100644
--- a/config/feature_flags/development/mergeability_caching.yml
+++ b/config/feature_flags/development/add_delete_branch_worker.yml
@@ -1,8 +1,8 @@
 ---
-name: mergeability_caching
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68312
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340810
-milestone: '14.4'
+name: add_delete_branch_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102208
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381640
+milestone: '15.6'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/cache_unleash_client_api.yml b/config/feature_flags/development/ai_assist_api.yml
index dcaa9c323c4..9b7da480f62 100644
--- a/config/feature_flags/development/cache_unleash_client_api.yml
+++ b/config/feature_flags/development/ai_assist_api.yml
@@ -1,8 +1,8 @@
 ---
-name: cache_unleash_client_api
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90490
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365575
-milestone: '15.2'
+name: ai_assist_api
+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::release
+group: group::incubation
 default_enabled: false
diff --git a/config/feature_flags/development/ai_assist_flag.yml b/config/feature_flags/development/ai_assist_flag.yml
new file mode 100644
index 00000000000..ce8bff8267c
--- /dev/null
+++ b/config/feature_flags/development/ai_assist_flag.yml
@@ -0,0 +1,8 @@
+---
+name: ai_assist_flag
+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
+default_enabled: false
diff --git a/config/feature_flags/development/ajax_new_deploy_token.yml b/config/feature_flags/development/ajax_new_deploy_token.yml
deleted file mode 100644
index 6b0d9697006..00000000000
--- a/config/feature_flags/development/ajax_new_deploy_token.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ajax_new_deploy_token
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27141
-rollout_issue_url: 
-milestone: '12.10'
-type: development
-group: group::release
-default_enabled: false
diff --git a/config/feature_flags/development/allow_audit_event_type_filtering.yml b/config/feature_flags/development/allow_audit_event_type_filtering.yml
new file mode 100644
index 00000000000..e5cbd2fddcf
--- /dev/null
+++ b/config/feature_flags/development/allow_audit_event_type_filtering.yml
@@ -0,0 +1,8 @@
+---
+name: allow_audit_event_type_filtering
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102502
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373833
+milestone: '15.6'
+type: development
+group: group::compliance
+default_enabled: false
diff --git a/config/feature_flags/development/work_items_hierarchy.yml b/config/feature_flags/development/apollo_boards.yml
index ce27c58df96..d95e60bf4ea 100644
--- a/config/feature_flags/development/work_items_hierarchy.yml
+++ b/config/feature_flags/development/apollo_boards.yml
@@ -1,8 +1,8 @@
 ---
-name: work_items_hierarchy
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88504
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363447
-milestone: '15.1'
+name: apollo_boards
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102719
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381210
+milestone: '15.6'
 type: development
 group: group::product planning
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/async_merge_request_diff_creation.yml b/config/feature_flags/development/async_merge_request_diff_creation.yml
new file mode 100644
index 00000000000..8e4bdd13b2b
--- /dev/null
+++ b/config/feature_flags/development/async_merge_request_diff_creation.yml
@@ -0,0 +1,8 @@
+---
+name: async_merge_request_diff_creation
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100390"
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/376759
+milestone: '15.6'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/board_grouped_by_epic_performance.yml b/config/feature_flags/development/board_grouped_by_epic_performance.yml
new file mode 100644
index 00000000000..08519f3c328
--- /dev/null
+++ b/config/feature_flags/development/board_grouped_by_epic_performance.yml
@@ -0,0 +1,8 @@
+---
+name: board_grouped_by_epic_performance
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101640'
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381664
+milestone: '15.6'
+type: development
+group: group::product planning
+default_enabled: false
diff --git a/config/feature_flags/development/optimized_project_and_group_activity_queries.yml b/config/feature_flags/development/bulk_update_membership_roles.yml
index 6efb0a3818a..701f72db3e1 100644
--- a/config/feature_flags/development/optimized_project_and_group_activity_queries.yml
+++ b/config/feature_flags/development/bulk_update_membership_roles.yml
@@ -1,8 +1,8 @@
 ---
-name: optimized_project_and_group_activity_queries
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85810
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360458
-milestone: '15.0'
+name: bulk_update_membership_roles
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96745
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373257
+milestone: '15.6'
 type: development
 group: group::workspace
 default_enabled: false
diff --git a/config/feature_flags/development/limit_assignees_per_issuable.yml b/config/feature_flags/development/check_etags_diffs_batch_before_write_cache.yml
index d950b8c2f09..fb03ff91d0a 100644
--- a/config/feature_flags/development/limit_assignees_per_issuable.yml
+++ b/config/feature_flags/development/check_etags_diffs_batch_before_write_cache.yml
@@ -1,8 +1,8 @@
 ---
-name: limit_assignees_per_issuable
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95673
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373237
-milestone: '15.5'
+name: check_etags_diffs_batch_before_write_cache
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101421
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378333
+milestone: '15.6'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/ci_assign_job_token_on_scheduling.yml b/config/feature_flags/development/ci_assign_job_token_on_scheduling.yml
new file mode 100644
index 00000000000..179fef03d5e
--- /dev/null
+++ b/config/feature_flags/development/ci_assign_job_token_on_scheduling.yml
@@ -0,0 +1,8 @@
+---
+name: ci_assign_job_token_on_scheduling
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103377
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382042
+milestone: '15.6'
+type: development
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/development/ci_detect_wrongly_expired_artifacts.yml b/config/feature_flags/development/ci_detect_wrongly_expired_artifacts.yml
deleted file mode 100644
index d48747c3bf5..00000000000
--- a/config/feature_flags/development/ci_detect_wrongly_expired_artifacts.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_detect_wrongly_expired_artifacts
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82084
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354955
-milestone: '14.9'
-type: development
-group: group::pipeline insights
-default_enabled: true
diff --git a/config/feature_flags/development/ci_job_jwt.yml b/config/feature_flags/development/ci_job_jwt.yml
deleted file mode 100644
index 3ce97c6334c..00000000000
--- a/config/feature_flags/development/ci_job_jwt.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_job_jwt
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28063
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/207125
-milestone: '12.10'
-type: development
-group: group::configure
-default_enabled: true
diff --git a/config/feature_flags/development/trigger_mr_subscription_on_merge_status_change.yml b/config/feature_flags/development/ci_partitioning_use_ci_builds_metadata_routing_table.yml
index 058fde35110..71c2aa735a2 100644
--- a/config/feature_flags/development/trigger_mr_subscription_on_merge_status_change.yml
+++ b/config/feature_flags/development/ci_partitioning_use_ci_builds_metadata_routing_table.yml
@@ -1,8 +1,8 @@
 ---
-name: trigger_mr_subscription_on_merge_status_change
-introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99213"
-rollout_issue_url: "https://gitlab.com/gitlab-org/gitlab/-/issues/375704"
-milestone: '15.5'
+name: ci_partitioning_use_ci_builds_metadata_routing_table
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100935"
+rollout_issue_url: "https://gitlab.com/gitlab-org/gitlab/-/issues/378601"
+milestone: '15.6'
 type: development
-group: group::code review
+group: "group::pipeline execution"
 default_enabled: false
diff --git a/config/feature_flags/development/ci_variable_settings_graphql.yml b/config/feature_flags/development/ci_raw_variables_in_yaml_config.yml
index 0af109968ab..ab135526c0b 100644
--- a/config/feature_flags/development/ci_variable_settings_graphql.yml
+++ b/config/feature_flags/development/ci_raw_variables_in_yaml_config.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_variable_settings_graphql
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89332
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364423
-milestone: '15.1'
+name: ci_raw_variables_in_yaml_config
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98420
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375034
+milestone: '15.6'
 type: development
 group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/ci_recreate_downstream_pipeline.yml b/config/feature_flags/development/ci_recreate_downstream_pipeline.yml
deleted file mode 100644
index 17b8a0965fc..00000000000
--- a/config/feature_flags/development/ci_recreate_downstream_pipeline.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_recreate_downstream_pipeline
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83613
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358409
-milestone: '14.10'
-type: development
-group: group::pipeline authoring
-default_enabled: false
diff --git a/config/feature_flags/development/ci_requeue_with_dag_object_hierarchy.yml b/config/feature_flags/development/ci_requeue_with_dag_object_hierarchy.yml
deleted file mode 100644
index b6f4974915b..00000000000
--- a/config/feature_flags/development/ci_requeue_with_dag_object_hierarchy.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_requeue_with_dag_object_hierarchy
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97156
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373148
-milestone: '15.4'
-type: development
-group: group::pipeline authoring
-default_enabled: true
diff --git a/config/feature_flags/development/ci_job_artifacts_cdn.yml b/config/feature_flags/development/ci_retry_job_fix.yml
index 4a019312ee7..30782e57dea 100644
--- a/config/feature_flags/development/ci_job_artifacts_cdn.yml
+++ b/config/feature_flags/development/ci_retry_job_fix.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_job_artifacts_cdn
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98010
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373860
-milestone: '15.5'
+name: ci_retry_job_fix
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100712
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/207988
+milestone: '15.6'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/ci_stop_expanding_file_vars_for_runners.yml b/config/feature_flags/development/ci_stop_expanding_file_vars_for_runners.yml
deleted file mode 100644
index a78290b65d6..00000000000
--- a/config/feature_flags/development/ci_stop_expanding_file_vars_for_runners.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_stop_expanding_file_vars_for_runners
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94198
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369907
-milestone: '15.3'
-type: development
-group: group::pipeline authoring
-default_enabled: true
diff --git a/config/feature_flags/development/container_registry_delete_repository_with_cron_worker.yml b/config/feature_flags/development/container_registry_delete_repository_with_cron_worker.yml
new file mode 100644
index 00000000000..ef531228398
--- /dev/null
+++ b/config/feature_flags/development/container_registry_delete_repository_with_cron_worker.yml
@@ -0,0 +1,8 @@
+---
+name: container_registry_delete_repository_with_cron_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101918
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378818
+milestone: '15.6'
+type: development
+group: group::container registry
+default_enabled: false
diff --git a/config/feature_flags/development/container_registry_show_shortened_path.yml b/config/feature_flags/development/container_registry_show_shortened_path.yml
deleted file mode 100644
index 33781386e8a..00000000000
--- a/config/feature_flags/development/container_registry_show_shortened_path.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: container_registry_show_shortened_path
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91548
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366808
-milestone: '15.2'
-type: development
-group: group::package
-default_enabled: false
diff --git a/config/feature_flags/development/cube_api_proxy.yml b/config/feature_flags/development/cube_api_proxy.yml
deleted file mode 100644
index 06dcefb1303..00000000000
--- a/config/feature_flags/development/cube_api_proxy.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: cube_api_proxy
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96250
-rollout_issue_url:
-milestone: '15.4'
-type: development
-group: group::product_analytics
-default_enabled: false
diff --git a/config/feature_flags/development/dast_api_scanner.yml b/config/feature_flags/development/dast_api_scanner.yml
index 8299004fecb..5cc268ee9b9 100644
--- a/config/feature_flags/development/dast_api_scanner.yml
+++ b/config/feature_flags/development/dast_api_scanner.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345837
 milestone: '14.7'
 type: development
 group: group::dynamic analysis
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/disable_load_entire_blob_for_diff_viewer.yml b/config/feature_flags/development/disable_load_entire_blob_for_diff_viewer.yml
deleted file mode 100644
index 5e767e3540b..00000000000
--- a/config/feature_flags/development/disable_load_entire_blob_for_diff_viewer.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: disable_load_entire_blob_for_diff_viewer
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99029
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/376330
-milestone: '15.5'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/enable_new_sentry_clientside_integration.yml b/config/feature_flags/development/enable_new_sentry_clientside_integration.yml
new file mode 100644
index 00000000000..338fd2b1e25
--- /dev/null
+++ b/config/feature_flags/development/enable_new_sentry_clientside_integration.yml
@@ -0,0 +1,8 @@
+---
+name: enable_new_sentry_clientside_integration
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102650
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344832
+milestone: '15.6'
+type: development
+group: group::runner
+default_enabled: false
diff --git a/config/feature_flags/development/approval_rules_eligible_filter.yml b/config/feature_flags/development/enhanced_webhook_support_regex.yml
index e8d925d08a7..2c0d2c82dbf 100644
--- a/config/feature_flags/development/approval_rules_eligible_filter.yml
+++ b/config/feature_flags/development/enhanced_webhook_support_regex.yml
@@ -1,8 +1,8 @@
 ---
-name: approval_rules_eligible_filter
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100192
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/376331
-milestone: '15.5'
+name: enhanced_webhook_support_regex
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97235
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375728
+milestone: '15.6'
 type: development
-group: group::source code
+group: group::integrations
 default_enabled: false
diff --git a/config/feature_flags/development/error_tracking_sentry_limit.yml b/config/feature_flags/development/error_tracking_sentry_limit.yml
deleted file mode 100644
index 75a32fa2114..00000000000
--- a/config/feature_flags/development/error_tracking_sentry_limit.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: error_tracking_sentry_limit
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84209
-rollout_issue_url:  https://gitlab.com/gitlab-org/gitlab/-/issues/372427
-milestone: '15.4'
-type: development
-group: group::observability
-default_enabled: false
diff --git a/config/feature_flags/development/externally_stored_diffs_caching_export.yml b/config/feature_flags/development/externally_stored_diffs_caching_export.yml
deleted file mode 100644
index 395ce5c7cb9..00000000000
--- a/config/feature_flags/development/externally_stored_diffs_caching_export.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: externally_stored_diffs_caching_export
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90159
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366255
-milestone: '15.2'
-type: development
-group: group::import
-default_enabled: false
diff --git a/config/feature_flags/development/hash_oauth_tokens.yml b/config/feature_flags/development/hash_oauth_tokens.yml
deleted file mode 100644
index 96bd4a3702e..00000000000
--- a/config/feature_flags/development/hash_oauth_tokens.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: hash_oauth_tokens
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91501
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367570
-milestone: '15.3'
-type: development
-group: group::authentication and authorization
-default_enabled: true
diff --git a/config/feature_flags/development/incident_declare_slash_command.yml b/config/feature_flags/development/incident_declare_slash_command.yml
new file mode 100644
index 00000000000..9a35dd3274c
--- /dev/null
+++ b/config/feature_flags/development/incident_declare_slash_command.yml
@@ -0,0 +1,8 @@
+---
+name: incident_declare_slash_command
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101177
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378072
+milestone: '15.6'
+type: development
+group: group::respond
+default_enabled: false
diff --git a/config/feature_flags/development/integration_slack_app_notifications.yml b/config/feature_flags/development/integration_slack_app_notifications.yml
index d233194c6d4..4b9903b25c9 100644
--- a/config/feature_flags/development/integration_slack_app_notifications.yml
+++ b/config/feature_flags/development/integration_slack_app_notifications.yml
@@ -1,7 +1,7 @@
 ---
 name: integration_slack_app_notifications
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98663
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381012
 milestone: '15.5'
 type: development
 group: group::integrations
diff --git a/config/feature_flags/development/ipynb_semantic_diff.yml b/config/feature_flags/development/ipynb_semantic_diff.yml
deleted file mode 100644
index ef16cacaa37..00000000000
--- a/config/feature_flags/development/ipynb_semantic_diff.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ipynb_semantic_diff
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85079
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358917
-milestone: '15.0'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/jira_connect_oauth_self_managed_setting.yml b/config/feature_flags/development/jira_connect_oauth_self_managed_setting.yml
new file mode 100644
index 00000000000..05232d0f80a
--- /dev/null
+++ b/config/feature_flags/development/jira_connect_oauth_self_managed_setting.yml
@@ -0,0 +1,8 @@
+---
+name: jira_connect_oauth_self_managed_setting
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100725
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377679
+milestone: '15.6'
+type: development
+group: group::integrations
+default_enabled: false
diff --git a/config/feature_flags/development/job_webhook_retries_count.yml b/config/feature_flags/development/job_webhook_retries_count.yml
new file mode 100644
index 00000000000..96b33695440
--- /dev/null
+++ b/config/feature_flags/development/job_webhook_retries_count.yml
@@ -0,0 +1,8 @@
+---
+name: job_webhook_retries_count
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101618
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382046
+milestone: '15.6'
+type: development
+group: group::delivery
+default_enabled: false
diff --git a/config/feature_flags/development/lazy_load_commits.yml b/config/feature_flags/development/lazy_load_commits.yml
index d4764907211..6140b88c3c2 100644
--- a/config/feature_flags/development/lazy_load_commits.yml
+++ b/config/feature_flags/development/lazy_load_commits.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342497
 milestone: '14.4'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/merge_request_widget_graphql.yml b/config/feature_flags/development/merge_request_widget_graphql.yml
deleted file mode 100644
index 8d13c6b1c62..00000000000
--- a/config/feature_flags/development/merge_request_widget_graphql.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: merge_request_widget_graphql
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38311
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267560
-milestone: '13.3'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/ml_experiment_tracking.yml b/config/feature_flags/development/ml_experiment_tracking.yml
index 2749cbc3fc1..19f14196591 100644
--- a/config/feature_flags/development/ml_experiment_tracking.yml
+++ b/config/feature_flags/development/ml_experiment_tracking.yml
@@ -2,7 +2,8 @@
 name: ml_experiment_tracking
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95689
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371669
-milestone: '15.4'
+milestone: '15.6'
 type: development
 group: group::incubation
 default_enabled: false
+log_state_changes: true
diff --git a/config/feature_flags/development/observability_group_tab.yml b/config/feature_flags/development/observability_group_tab.yml
index b588a74e7d0..168299c15af 100644
--- a/config/feature_flags/development/observability_group_tab.yml
+++ b/config/feature_flags/development/observability_group_tab.yml
@@ -1,7 +1,7 @@
 ---
 name: observability_group_tab
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96374
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381740
 milestone: '15.3'
 type: development
 group: group::observability
diff --git a/config/feature_flags/development/pbkdf2_password_encryption.yml b/config/feature_flags/development/pbkdf2_password_encryption.yml
deleted file mode 100644
index 995173a6a38..00000000000
--- a/config/feature_flags/development/pbkdf2_password_encryption.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: pbkdf2_password_encryption
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91622
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367147
-milestone: '15.2'
-type: development
-group: group::authentication and authorization
-default_enabled: false
diff --git a/config/feature_flags/development/pbkdf2_password_encryption_write.yml b/config/feature_flags/development/pbkdf2_password_encryption_write.yml
deleted file mode 100644
index 29c7baedaf2..00000000000
--- a/config/feature_flags/development/pbkdf2_password_encryption_write.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: pbkdf2_password_encryption_write
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91622
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367147
-milestone: '15.2'
-type: development
-group: group::authentication and authorization
-default_enabled: false
diff --git a/config/feature_flags/development/preferred_language_switcher.yml b/config/feature_flags/development/preferred_language_switcher.yml
new file mode 100644
index 00000000000..9dedb1421aa
--- /dev/null
+++ b/config/feature_flags/development/preferred_language_switcher.yml
@@ -0,0 +1,7 @@
+---
+name: preferred_language_switcher
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101621
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381181
+milestone: '15.6'
+type: development
+default_enabled: false
diff --git a/config/feature_flags/development/product_analytics.yml b/config/feature_flags/development/product_analytics.yml
deleted file mode 100644
index 4dfe0ce57d8..00000000000
--- a/config/feature_flags/development/product_analytics.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: product_analytics
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36443
-rollout_issue_url: 
-milestone: '13.2'
-type: development
-group: group::product intelligence
-default_enabled: false
diff --git a/config/feature_flags/development/group_overview_tabs_vue.yml b/config/feature_flags/development/projects_preloader_fix.yml
index 4c54ab31b53..1ad578f11a4 100644
--- a/config/feature_flags/development/group_overview_tabs_vue.yml
+++ b/config/feature_flags/development/projects_preloader_fix.yml
@@ -1,8 +1,8 @@
 ---
-name: group_overview_tabs_vue
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95850
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370872
-milestone: '15.4'
+name: projects_preloader_fix
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96108
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378858
+milestone: '15.6'
 type: development
 group: group::workspace
 default_enabled: false
diff --git a/config/feature_flags/development/realtime_reviewers.yml b/config/feature_flags/development/realtime_reviewers.yml
new file mode 100644
index 00000000000..a7da47a3c29
--- /dev/null
+++ b/config/feature_flags/development/realtime_reviewers.yml
@@ -0,0 +1,8 @@
+---
+name: realtime_reviewers
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99137'
+rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/378299'
+milestone: '15.5'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/remove_extra_primary_submenu_options.yml b/config/feature_flags/development/remove_extra_primary_submenu_options.yml
deleted file mode 100644
index dda22c5d57e..00000000000
--- a/config/feature_flags/development/remove_extra_primary_submenu_options.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: remove_extra_primary_submenu_options
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96931
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373078
-milestone: '15.4'
-type: development
-group: group::foundations
-default_enabled: true
diff --git a/config/feature_flags/development/agent_authorization_include_descendants.yml b/config/feature_flags/development/require_approval_on_scan_removal.yml
index 17d3a484395..2cbbe8e49f8 100644
--- a/config/feature_flags/development/agent_authorization_include_descendants.yml
+++ b/config/feature_flags/development/require_approval_on_scan_removal.yml
@@ -1,8 +1,8 @@
 ---
-name: agent_authorization_include_descendants
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95774
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371310
-milestone: '15.5'
+name: require_approval_on_scan_removal
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102631
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382079
+milestone: '15.6'
 type: development
-group: group::configure
+group: group::security policies
 default_enabled: false
diff --git a/config/feature_flags/development/root_level_issues_query.yml b/config/feature_flags/development/root_level_issues_query.yml
new file mode 100644
index 00000000000..308f9168167
--- /dev/null
+++ b/config/feature_flags/development/root_level_issues_query.yml
@@ -0,0 +1,8 @@
+---
+name: root_level_issues_query
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102348
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382250
+milestone: '15.6'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/root_statistics_worker_read_replica.yml b/config/feature_flags/development/root_statistics_worker_read_replica.yml
new file mode 100644
index 00000000000..516bead1ee7
--- /dev/null
+++ b/config/feature_flags/development/root_statistics_worker_read_replica.yml
@@ -0,0 +1,8 @@
+---
+name: root_statistics_worker_read_replica
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102516
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/379678
+milestone: '15.6'
+type: development
+group: group::utilization
+default_enabled: false
diff --git a/config/feature_flags/development/saml_group_sync_retain_default_membership.yml b/config/feature_flags/development/saml_group_sync_retain_default_membership.yml
deleted file mode 100644
index dbaaf681fb9..00000000000
--- a/config/feature_flags/development/saml_group_sync_retain_default_membership.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: saml_group_sync_retain_default_membership
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88064
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364144
-milestone: '15.1'
-type: development
-group: group::authentication and authorization
-default_enabled: false
diff --git a/config/feature_flags/development/audit_invalid_approver_rules.yml b/config/feature_flags/development/scan_result_role_action.yml
index eca5ffc25bb..e6a4a552350 100644
--- a/config/feature_flags/development/audit_invalid_approver_rules.yml
+++ b/config/feature_flags/development/scan_result_role_action.yml
@@ -1,8 +1,8 @@
 ---
-name: audit_invalid_approver_rules
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98636
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375060
-milestone: '15.5'
+name: scan_result_role_action
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101464
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377866
+milestone: '15.6'
 type: development
-group: group::code review
+group: group::security policies
 default_enabled: false
diff --git a/config/feature_flags/development/search_index_curation.yml b/config/feature_flags/development/search_index_curation.yml
new file mode 100644
index 00000000000..ddcc243c60f
--- /dev/null
+++ b/config/feature_flags/development/search_index_curation.yml
@@ -0,0 +1,8 @@
+---
+name: search_index_curation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98809
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375274
+milestone: '15.6'
+type: development
+group: group::global search
+default_enabled: false
diff --git a/config/feature_flags/development/split_operations_visibility_permissions.yml b/config/feature_flags/development/split_operations_visibility_permissions.yml
index 612876a2dcd..56955733217 100644
--- a/config/feature_flags/development/split_operations_visibility_permissions.yml
+++ b/config/feature_flags/development/split_operations_visibility_permissions.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364240
 milestone: '15.1'
 type: development
 group: group::respond
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/track_delete_source_errors.yml b/config/feature_flags/development/track_delete_source_errors.yml
deleted file mode 100644
index 57152ed86cd..00000000000
--- a/config/feature_flags/development/track_delete_source_errors.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: track_delete_source_errors
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99028
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377258
-milestone: '15.5'
-type: development
-group: group::code review
-default_enabled: false
diff --git a/config/feature_flags/development/refactor_mr_widget_test_summary.yml b/config/feature_flags/development/usage_data_ci_i_testing_coverage_report_uploaded.yml
index 902248f1d85..f3a3772972e 100644
--- a/config/feature_flags/development/refactor_mr_widget_test_summary.yml
+++ b/config/feature_flags/development/usage_data_ci_i_testing_coverage_report_uploaded.yml
@@ -1,8 +1,8 @@
 ---
-name: refactor_mr_widget_test_summary
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83631
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358208
-milestone: '15.0'
+name: usage_data_ci_i_testing_coverage_report_uploaded
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102371
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339721
+milestone: '15.6'
 type: development
 group: group::pipeline insights
 default_enabled: false
diff --git a/config/feature_flags/development/cascade_package_forwarding_settings.yml b/config/feature_flags/development/use_iid_in_work_items_path.yml
index 2b09c25d6f9..d2d328bbbc1 100644
--- a/config/feature_flags/development/cascade_package_forwarding_settings.yml
+++ b/config/feature_flags/development/use_iid_in_work_items_path.yml
@@ -1,8 +1,8 @@
 ---
-name: cascade_package_forwarding_settings
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99285
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375761
+name: use_iid_in_work_items_path
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101451
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378349
 milestone: '15.5'
 type: development
-group: group::package
+group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/user_destroy_with_limited_execution_time_worker.yml b/config/feature_flags/development/user_destroy_with_limited_execution_time_worker.yml
deleted file mode 100644
index 9eacfc019ac..00000000000
--- a/config/feature_flags/development/user_destroy_with_limited_execution_time_worker.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: user_destroy_with_limited_execution_time_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97141
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373138
-milestone: '15.4'
-type: development
-group: group::authentication and authorization
-default_enabled: false
diff --git a/config/feature_flags/development/verify_gitlab_shell_worker_method_names.yml b/config/feature_flags/development/verify_gitlab_shell_worker_method_names.yml
new file mode 100644
index 00000000000..d6b28c28600
--- /dev/null
+++ b/config/feature_flags/development/verify_gitlab_shell_worker_method_names.yml
@@ -0,0 +1,8 @@
+---
+name: verify_gitlab_shell_worker_method_names
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103783
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371470
+milestone: '15.6'
+type: development
+group: group::scalability
+default_enabled: false
diff --git a/config/feature_flags/development/verify_mail_scheduler_notification_service_worker_method_names.yml b/config/feature_flags/development/verify_mail_scheduler_notification_service_worker_method_names.yml
new file mode 100644
index 00000000000..0fc30f63047
--- /dev/null
+++ b/config/feature_flags/development/verify_mail_scheduler_notification_service_worker_method_names.yml
@@ -0,0 +1,8 @@
+---
+name: verify_mail_scheduler_notification_service_worker_method_names
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103785
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371470
+milestone: '15.6'
+type: development
+group: group::scalability
+default_enabled: false
diff --git a/config/feature_flags/development/new_navbar_layout.yml b/config/feature_flags/development/vue_group_select.yml
index 2d212922fcc..d31f57a3eb9 100644
--- a/config/feature_flags/development/new_navbar_layout.yml
+++ b/config/feature_flags/development/vue_group_select.yml
@@ -1,8 +1,8 @@
 ---
-name: new_navbar_layout
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96853
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373078
-milestone: '15.4'
+name: vue_group_select
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98597
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381042
+milestone: '15.6'
 type: development
 group: group::foundations
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/realtime_labels.yml b/config/feature_flags/development/vue_issues_dashboard.yml
index 0c047a09a6d..133343b3a3c 100644
--- a/config/feature_flags/development/realtime_labels.yml
+++ b/config/feature_flags/development/vue_issues_dashboard.yml
@@ -1,8 +1,8 @@
 ---
-name: realtime_labels
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83743
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357370
-milestone: '14.10'
+name: vue_issues_dashboard
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102197
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/379025
+milestone: '15.6'
 type: development
 group: group::project management
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/work_items_mvc.yml b/config/feature_flags/development/work_items_mvc.yml
new file mode 100644
index 00000000000..928175c70ba
--- /dev/null
+++ b/config/feature_flags/development/work_items_mvc.yml
@@ -0,0 +1,8 @@
+---
+name: work_items_mvc
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101062"
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377912
+milestone: '15.5'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/workhorse_google_client.yml b/config/feature_flags/development/workhorse_google_client.yml
new file mode 100644
index 00000000000..e3417ac4afd
--- /dev/null
+++ b/config/feature_flags/development/workhorse_google_client.yml
@@ -0,0 +1,8 @@
+---
+name: workhorse_google_client
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96891
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372596
+milestone: '15.6'
+type: development
+group: 'group::package registry'
+default_enabled: false
diff --git a/config/feature_flags/experiment/disable_network_graph_notes_count.yml b/config/feature_flags/experiment/disable_network_graph_notes_count.yml
new file mode 100644
index 00000000000..fa4e5b4e104
--- /dev/null
+++ b/config/feature_flags/experiment/disable_network_graph_notes_count.yml
@@ -0,0 +1,8 @@
+---
+name: disable_network_graph_notes_count
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103636"
+rollout_issue_url: 
+milestone: '15.6'
+type: experiment
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/experiment/generic_explore_groups.yml b/config/feature_flags/experiment/generic_explore_groups.yml
new file mode 100644
index 00000000000..635af65f000
--- /dev/null
+++ b/config/feature_flags/experiment/generic_explore_groups.yml
@@ -0,0 +1,8 @@
+---
+name: generic_explore_groups
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103019"
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381564
+milestone: '15.6'
+type: experiment
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/experiment/logged_out_marketing_header.yml b/config/feature_flags/experiment/logged_out_marketing_header.yml
deleted file mode 100644
index 8bc09d59b16..00000000000
--- a/config/feature_flags/experiment/logged_out_marketing_header.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: logged_out_marketing_header
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76076
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348525
-milestone: '14.7'
-type: experiment
-group: group::activation
-default_enabled: false
diff --git a/config/feature_flags/ops/ci_partitioning_analyze_queries_partition_id_check.yml b/config/feature_flags/ops/ci_partitioning_analyze_queries_partition_id_check.yml
new file mode 100644
index 00000000000..1d3efcea70a
--- /dev/null
+++ b/config/feature_flags/ops/ci_partitioning_analyze_queries_partition_id_check.yml
@@ -0,0 +1,8 @@
+---
+name: ci_partitioning_analyze_queries_partition_id_check
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100804
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378282
+milestone: '15.6'
+type: ops
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/ops/purge_stale_security_findings.yml b/config/feature_flags/ops/purge_stale_security_findings.yml
index 0c011a1ddae..b540c8a1d60 100644
--- a/config/feature_flags/ops/purge_stale_security_findings.yml
+++ b/config/feature_flags/ops/purge_stale_security_findings.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356464
 milestone: '14.9'
 type: ops
 group: group::threat insights
-default_enabled: false
+default_enabled: true
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 050d112843f..732d46d284b 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -505,11 +505,11 @@ production: &base
   # Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc.
   # Please read here for more information: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job
   cron_jobs:
-    # Interval, in seconds, for each Sidekiq process to check for scheduled cron jobs that need to be enqueued. If set
-    # to 0, disable polling for cron jobs entirely. This is useful in setups with multiple Sidekiq processes if you want
-    # to limit which ones perform this task. Note that at least one process in your instance needs to have polling
-    # enabled for cron jobs to be executed.
-    poll_interval: 30
+    # Interval, in seconds, for each Sidekiq process to check for scheduled cron jobs that need to be enqueued. If not
+    # set, the interval scales dynamically with the number of Sidekiq processes. If set to 0, disable polling for cron
+    # jobs entirely.
+    # poll_interval: 30
+
     # Flag stuck CI jobs as failed
     stuck_ci_jobs_worker:
       cron: "0 * * * *"
diff --git a/config/gitlab_loose_foreign_keys.yml b/config/gitlab_loose_foreign_keys.yml
index 1530c681eb0..efb14cdea36 100644
--- a/config/gitlab_loose_foreign_keys.yml
+++ b/config/gitlab_loose_foreign_keys.yml
@@ -14,10 +14,6 @@ ci_builds:
   - table: ci_runners
     column: runner_id
     on_delete: async_nullify
-ci_builds_metadata:
-  - table: projects
-    column: project_id
-    on_delete: async_delete
 ci_daily_build_group_report_results:
   - table: namespaces
     column: group_id
@@ -210,6 +206,10 @@ merge_trains:
   - table: ci_pipelines
     column: pipeline_id
     on_delete: async_nullify
+p_ci_builds_metadata:
+  - table: projects
+    column: project_id
+    on_delete: async_delete
 packages_build_infos:
   - table: ci_pipelines
     column: pipeline_id
diff --git a/config/initializers/0_inject_enterprise_edition_module.rb b/config/initializers/0_inject_enterprise_edition_module.rb
index 1951940a2a1..cc67e384d83 100644
--- a/config/initializers/0_inject_enterprise_edition_module.rb
+++ b/config/initializers/0_inject_enterprise_edition_module.rb
@@ -35,6 +35,12 @@ module InjectEnterpriseEditionModule
     include_mod_with(name) # rubocop: disable Cop/InjectEnterpriseEditionModule
   end
 
+  def gitlab_extensions
+    extensions = [self]
+    each_extension_for(name, Object) { |c| extensions << c }
+    extensions
+  end
+
   private
 
   def prepend_module(mod, with_descendants)
diff --git a/config/initializers/0_marginalia.rb b/config/initializers/0_marginalia.rb
index e88599fd93c..c776747939f 100644
--- a/config/initializers/0_marginalia.rb
+++ b/config/initializers/0_marginalia.rb
@@ -13,7 +13,8 @@ require 'marginalia'
 # matching against the raw SQL, and prepending the comment prevents color
 # coding from working in the development log.
 Marginalia::Comment.prepend_comment = true if Rails.env.production?
-Marginalia::Comment.components = [:application, :correlation_id, :jid, :endpoint_id, :db_config_name]
+Marginalia::Comment.components = [:application, :correlation_id, :jid, :endpoint_id, :db_config_name,
+                                  :console_hostname, :console_username]
 
 # As mentioned in https://github.com/basecamp/marginalia/pull/93/files,
 # adding :line has some overhead because a regexp on the backtrace has
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 2244e415c3d..da4277c8146 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -457,7 +457,7 @@ if Gitlab.ee? && Settings['ee_cron_jobs']
   Settings.cron_jobs.merge!(Settings.ee_cron_jobs)
 end
 
-Settings.cron_jobs['poll_interval'] ||= 30
+Settings.cron_jobs['poll_interval'] ||= nil
 Settings.cron_jobs['stuck_ci_jobs_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['stuck_ci_jobs_worker']['cron'] ||= '0 * * * *'
 Settings.cron_jobs['stuck_ci_jobs_worker']['job_class'] = 'StuckCiJobsWorker'
@@ -572,6 +572,9 @@ Settings.cron_jobs['container_registry_migration_observer_worker']['job_class']
 Settings.cron_jobs['container_registry_migration_enqueuer_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['container_registry_migration_enqueuer_worker']['cron'] ||= '15,45 */1 * * *'
 Settings.cron_jobs['container_registry_migration_enqueuer_worker']['job_class'] = 'ContainerRegistry::Migration::EnqueuerWorker'
+Settings.cron_jobs['cleanup_container_registry_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['cleanup_container_registry_worker']['cron'] ||= '*/5 * * * *'
+Settings.cron_jobs['cleanup_container_registry_worker']['job_class'] = 'ContainerRegistry::CleanupWorker'
 Settings.cron_jobs['image_ttl_group_policy_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['image_ttl_group_policy_worker']['cron'] ||= '40 0 * * *'
 Settings.cron_jobs['image_ttl_group_policy_worker']['job_class'] = 'DependencyProxy::ImageTtlGroupPolicyWorker'
@@ -579,7 +582,7 @@ Settings.cron_jobs['cleanup_dependency_proxy_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['cleanup_dependency_proxy_worker']['cron'] ||= '20 3,15 * * *'
 Settings.cron_jobs['cleanup_dependency_proxy_worker']['job_class'] = 'DependencyProxy::CleanupDependencyProxyWorker'
 Settings.cron_jobs['cleanup_package_registry_worker'] ||= Settingslogic.new({})
-Settings.cron_jobs['cleanup_package_registry_worker']['cron'] ||= '20 0,12 * * *'
+Settings.cron_jobs['cleanup_package_registry_worker']['cron'] ||= '20 * * * *'
 Settings.cron_jobs['cleanup_package_registry_worker']['job_class'] = 'Packages::CleanupPackageRegistryWorker'
 Settings.cron_jobs['x509_issuer_crl_check_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['x509_issuer_crl_check_worker']['cron'] ||= '30 1 * * *'
@@ -770,7 +773,7 @@ Gitlab.ee do
   Settings.cron_jobs['iterations_generator_worker']['cron'] ||= '5 0 * * *'
   Settings.cron_jobs['iterations_generator_worker']['job_class'] = 'Iterations::Cadences::ScheduleCreateIterationsWorker'
   Settings.cron_jobs['vulnerability_statistics_schedule_worker'] ||= Settingslogic.new({})
-  Settings.cron_jobs['vulnerability_statistics_schedule_worker']['cron'] ||= '15 1 * * *'
+  Settings.cron_jobs['vulnerability_statistics_schedule_worker']['cron'] ||= '15 1,20 * * *'
   Settings.cron_jobs['vulnerability_statistics_schedule_worker']['job_class'] = 'Vulnerabilities::Statistics::ScheduleWorker'
   Settings.cron_jobs['vulnerability_historical_statistics_deletion_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['vulnerability_historical_statistics_deletion_worker']['cron'] ||= '15 3 * * *'
@@ -1023,6 +1026,7 @@ Settings.monitoring.sidekiq_health_checks['port'] ||= 8092
 
 Settings.monitoring['web_exporter'] ||= Settingslogic.new({})
 Settings.monitoring.web_exporter['enabled'] ||= false
+Settings.monitoring.web_exporter['log_enabled'] ||= true
 Settings.monitoring.web_exporter['address'] ||= 'localhost'
 Settings.monitoring.web_exporter['port'] ||= 8083
 Settings.monitoring.web_exporter['tls_enabled'] ||= false
diff --git a/config/initializers/8_devise.rb b/config/initializers/8_devise.rb
index 65314c4472f..237231f544f 100644
--- a/config/initializers/8_devise.rb
+++ b/config/initializers/8_devise.rb
@@ -178,14 +178,6 @@ Devise.setup do |config|
   # reset. Defaults to true, so a user is signed in automatically after a reset.
   config.sign_in_after_reset_password = false
 
-  # ==> Configuration for :encryptable
-  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
-  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
-  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
-  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
-  # REST_AUTH_SITE_KEY to pepper)
-  config.encryptor = :pbkdf2_sha512
-
   # Authentication through token does not store user in session and needs
   # to be supplied on each request. Useful if you are using the token as API token.
   config.skip_session_storage << :token_auth
diff --git a/config/initializers/active_support_json.rb b/config/initializers/active_support_json.rb
new file mode 100644
index 00000000000..5e38ebd7c89
--- /dev/null
+++ b/config/initializers/active_support_json.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module ActiveSupport
+  module JSON
+    module Encoding
+      self.json_encoder = Gitlab::Json::RailsEncoder
+
+      # This method is used only to test that our
+      # encoder maintains compatibility with the default
+      # ActiveSupport encoder. See spec/lib/gitlab/json_spec.rb
+      def self.use_encoder(encoder)
+        previous_encoder = json_encoder
+        self.json_encoder = encoder
+
+        result = yield
+
+        self.json_encoder = previous_encoder
+
+        result
+      end
+    end
+  end
+end
diff --git a/config/initializers/database_query_analyzers.rb b/config/initializers/database_query_analyzers.rb
index 2e73fbb79a2..ad6ed20b94d 100644
--- a/config/initializers/database_query_analyzers.rb
+++ b/config/initializers/database_query_analyzers.rb
@@ -1,15 +1,19 @@
 # frozen_string_literal: true
 
 # Currently we register validator only for `dev` or `test` environment
-Gitlab::Database::QueryAnalyzer.instance.hook!
-Gitlab::Database::QueryAnalyzer.instance.all_analyzers.append(::Gitlab::Database::QueryAnalyzers::GitlabSchemasMetrics)
-Gitlab::Database::QueryAnalyzer.instance.all_analyzers.append(
-  ::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification
-)
+Gitlab::Database::QueryAnalyzer.instance.tap do |query_analyzer|
+  query_analyzer.hook!
 
-if Gitlab.dev_or_test_env?
-  query_analyzer = ::Gitlab::Database::QueryAnalyzers::GitlabSchemasValidateConnection
-  Gitlab::Database::QueryAnalyzer.instance.all_analyzers.append(query_analyzer)
+  query_analyzer.all_analyzers.tap do |analyzers|
+    analyzers.append(::Gitlab::Database::QueryAnalyzers::GitlabSchemasMetrics)
+    analyzers.append(::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification)
+    analyzers.append(::Gitlab::Database::QueryAnalyzers::Ci::PartitioningRoutingAnalyzer)
+
+    if Gitlab.dev_or_test_env?
+      analyzers.append(::Gitlab::Database::QueryAnalyzers::GitlabSchemasValidateConnection)
+      analyzers.append(::Gitlab::Database::QueryAnalyzers::QueryRecorder)
+    end
+  end
 end
 
 Gitlab::Application.configure do |config|
diff --git a/config/initializers/google_api_client_patch.rb b/config/initializers/google_api_client_patch.rb
index 1408dcb0501..2a832790f97 100644
--- a/config/initializers/google_api_client_patch.rb
+++ b/config/initializers/google_api_client_patch.rb
@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 require 'google/apis/core/http_command'
+require 'google/apis/version'
 
-raise 'This patch is only tested with google-api-client-ruby v0.50.0' unless Google::Apis::VERSION == "0.50.0"
+raise 'This patch is only tested with google-api-client-ruby v0.53.0' unless Google::Apis::VERSION == "0.53.0"
 
 # The google-api-ruby-client does not have a way to increase or disable
 # the maximum allowed time for a request to be retried. By default, it
diff --git a/config/initializers/hashie_mash_permitted_patch.rb b/config/initializers/hashie_mash_permitted_patch.rb
new file mode 100644
index 00000000000..b793a408c91
--- /dev/null
+++ b/config/initializers/hashie_mash_permitted_patch.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# Pulls logic from https://github.com/Maxim-Filimonov/hashie-forbidden_attributes so we could drop the dependency.
+# This gem is simply `Hashie::Mash` monkey patch to allow mass assignment bypassing `:permitted?` check.
+#
+# Reasons:
+# 1. The gem was last updated 5 years ago and does not have CI setup to test under the latest Ruby/Rails.
+# 2. There is a significant chance this logic is not used at all.
+# We didn't find any explicit places in the code where we mass-assign to `Hashie::Mash`.
+# Experimental MR where we dropped the gem showed that no tests from the full suite failed:
+# https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101535
+# 3. The logic is very simple. Even if we need it, keeping it in our codebase is better than pulling a dependency.
+# This logic will be visible and it will be one less gem to install.
+#
+# Next steps:
+# 1. Keep the patch for at least one milestone in our codebase. Log its usage.
+# 2. After that, check if there were any related log events.
+# 3. If no usages were tracked, we could drop the patch (delete this file).
+# 4. Otherwise, audit where and why we need it, and add a comment to that place.
+#
+# See discussion https://gitlab.com/gitlab-org/gitlab/-/issues/378398#note_1143133426
+
+require 'hashie/mash'
+
+module Hashie
+  class Mash
+    module MonkeyPatch
+      def respond_to_missing?(method_name, *args)
+        if method_name == :permitted?
+          Gitlab::AppLogger.info(message: 'Hashie::Mash#respond_to?(:permitted?)',
+                                 caller: Gitlab::BacktraceCleaner.clean_backtrace(caller))
+
+          return false
+        end
+
+        super
+      end
+
+      def method_missing(method_name, *args)
+        if method_name == :permitted?
+          Gitlab::AppLogger.info(message: 'Hashie::Mash#permitted?',
+                                 caller: Gitlab::BacktraceCleaner.clean_backtrace(caller))
+
+          raise ArgumentError
+        end
+
+        super
+      end
+    end
+
+    prepend MonkeyPatch
+  end
+end
diff --git a/config/initializers/memory_watchdog.rb b/config/initializers/memory_watchdog.rb
index ce8e5029e7a..99c5d61293f 100644
--- a/config/initializers/memory_watchdog.rb
+++ b/config/initializers/memory_watchdog.rb
@@ -1,35 +1,14 @@
 # frozen_string_literal: true
 
 return unless Gitlab::Runtime.application?
-return unless Gitlab::Utils.to_boolean(ENV['GITLAB_MEMORY_WATCHDOG_ENABLED'])
+return unless Gitlab::Utils.to_boolean(ENV['GITLAB_MEMORY_WATCHDOG_ENABLED'], default: Gitlab::Runtime.puma?)
 
 Gitlab::Cluster::LifecycleEvents.on_worker_start do
   watchdog = Gitlab::Memory::Watchdog.new
-  max_strikes = ENV.fetch('GITLAB_MEMWD_MAX_STRIKES', 5).to_i
-  sleep_time_seconds = ENV.fetch('GITLAB_MEMWD_SLEEP_TIME_SEC', 60).to_i
-  max_mem_growth = ENV.fetch('GITLAB_MEMWD_MAX_MEM_GROWTH', 3.0).to_f
-  max_heap_frag = ENV.fetch('GITLAB_MEMWD_MAX_HEAP_FRAG', 0.5).to_f
-
-  watchdog.configure do |config|
-    config.handler =
-      if Gitlab::Runtime.puma?
-        Gitlab::Memory::Watchdog::PumaHandler.new
-      elsif Gitlab::Runtime.sidekiq?
-        Gitlab::Memory::Watchdog::TermProcessHandler.new
-      else
-        Gitlab::Memory::Watchdog::NullHandler.instance
-      end
-
-    config.logger = Gitlab::AppLogger
-    config.sleep_time_seconds = sleep_time_seconds
-    # config.monitor.use MonitorClass, args*, max_strikes:, kwargs**, &block
-    config.monitors.use Gitlab::Memory::Watchdog::Monitor::HeapFragmentation,
-      max_heap_fragmentation: max_heap_frag,
-      max_strikes: max_strikes
-
-    config.monitors.use Gitlab::Memory::Watchdog::Monitor::UniqueMemoryGrowth,
-      max_mem_growth: max_mem_growth,
-      max_strikes: max_strikes
+  if Gitlab::Runtime.puma?
+    watchdog.configure(&Gitlab::Memory::Watchdog::Configurator.configure_for_puma)
+  elsif Gitlab::Runtime.sidekiq?
+    watchdog.configure(&Gitlab::Memory::Watchdog::Configurator.configure_for_sidekiq)
   end
 
   Gitlab::BackgroundTask.new(watchdog).start
diff --git a/config/initializers/sawyer_patch.rb b/config/initializers/sawyer_patch.rb
index 34d2843d165..2a946cf0f7d 100644
--- a/config/initializers/sawyer_patch.rb
+++ b/config/initializers/sawyer_patch.rb
@@ -6,47 +6,21 @@ module SawyerClassPatch
   def attr_accessor(*attrs)
     attrs.each do |attribute|
       class_eval do
-        # rubocop:disable Gitlab/ModuleWithInstanceVariables
-        if method_defined?(attribute) || method_defined?("#{attribute}=") || method_defined?("#{attribute}?")
-          define_method attribute do
-            raise Sawyer::Error,
-              "Sawyer method \"#{attribute}\" overlaps Ruby method. Convert to a hash to access the attribute."
-          end
-
-          define_method "#{attribute}=" do |value|
-            raise Sawyer::Error,
-              "Sawyer method \"#{attribute}\" overlaps Ruby method. Convert to a hash to access the attribute."
-          end
-
-          define_method "#{attribute}?" do
-            raise Sawyer::Error,
-              "Sawyer method \"#{attribute}\" overlaps Ruby method. Convert to a hash to access the attribute."
-          end
-        else
-          define_method attribute do
-            Gitlab::Import::Logger.warn(
-              Gitlab::ApplicationContext.current.merge(
-                {
-                  message: 'Sawyer attribute called',
-                  attribute: attribute,
-                  caller: Gitlab::BacktraceCleaner.clean_backtrace(caller)
-                }
-              )
-            )
-
-            @attrs[attribute.to_sym]
-          end
+        define_method attribute do
+          raise Sawyer::Error,
+            "Sawyer method \"#{attribute}\" access is forbidden. Convert to a hash to access the attribute."
+        end
 
-          define_method "#{attribute}=" do |value|
-            @attrs[attribute.to_sym] = value
-          end
+        define_method "#{attribute}=" do |value|
+          raise Sawyer::Error,
+            "Sawyer method \"#{attribute}=\" access is forbidden. Convert to a hash to access the attribute."
+        end
 
-          define_method "#{attribute}?" do
-            !!@attrs[attribute.to_sym]
-          end
+        define_method "#{attribute}?" do
+          raise Sawyer::Error,
+            "Sawyer method \"#{attribute}?\" overlaps Ruby method. Convert to a hash to access the attribute."
         end
       end
-      # rubocop:enable Gitlab/ModuleWithInstanceVariables
     end
   end
 end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index cef34425bf4..363438849ed 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -35,19 +35,19 @@ enable_json_logs = Gitlab.config.sidekiq.log_format == 'json'
 enable_sidekiq_memory_killer = ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS'].to_i.nonzero?
 
 Sidekiq.configure_server do |config|
-  config.options[:strict] = false
-  config.options[:queues] = Gitlab::SidekiqConfig.expand_queues(config.options[:queues])
+  config[:strict] = false
+  config[:queues] = Gitlab::SidekiqConfig.expand_queues(config[:queues])
 
   if enable_json_logs
     config.log_formatter = Gitlab::SidekiqLogging::JSONFormatter.new
-    config.options[:job_logger] = Gitlab::SidekiqLogging::StructuredLogger
+    config[:job_logger] = Gitlab::SidekiqLogging::StructuredLogger
 
     # Remove the default-provided handler. The exception is logged inside
     # Gitlab::SidekiqLogging::StructuredLogger
-    config.error_handlers.reject! { |handler| handler.is_a?(Sidekiq::ExceptionHandler::Logger) }
+    config.error_handlers.delete(Sidekiq::DEFAULT_ERROR_HANDLER)
   end
 
-  Sidekiq.logger.info "Listening on queues #{config.options[:queues].uniq.sort}"
+  Sidekiq.logger.info "Listening on queues #{config[:queues].uniq.sort}"
 
   config.redis = queues_config_hash
 
@@ -83,14 +83,18 @@ Sidekiq.configure_server do |config|
     end
   end
 
+  config.on(:shutdown) do
+    Gitlab::Cluster::LifecycleEvents.do_worker_stop
+  end
+
   if enable_reliable_fetch?
-    config.options[:semi_reliable_fetch] = enable_semi_reliable_fetch_mode?
+    config[:semi_reliable_fetch] = enable_semi_reliable_fetch_mode?
     Sidekiq::ReliableFetch.setup_reliable_fetch!(config)
   end
 
   Gitlab::SidekiqVersioning.install!
 
-  config.options[:cron_poll_interval] = Gitlab.config.cron_jobs.poll_interval
+  config[:cron_poll_interval] = Gitlab.config.cron_jobs.poll_interval
   load_cron_jobs!
 
   # Avoid autoload issue such as 'Mail::Parsers::AddressStruct'
@@ -114,3 +118,4 @@ end
 
 Sidekiq::Scheduled::Poller.prepend Gitlab::Patch::SidekiqPoller
 Sidekiq::Cron::Poller.prepend Gitlab::Patch::SidekiqPoller
+Sidekiq::Cron::Poller.prepend Gitlab::Patch::SidekiqCronPoller
diff --git a/config/initializers/sidekiq_cluster.rb b/config/initializers/sidekiq_cluster.rb
index 6fd598b3e25..5851e3bd838 100644
--- a/config/initializers/sidekiq_cluster.rb
+++ b/config/initializers/sidekiq_cluster.rb
@@ -19,7 +19,7 @@ if ENV['ENABLE_SIDEKIQ_CLUSTER']
       # Allow sidekiq to cleanly terminate and push any running jobs back
       # into the queue.  We use the configured timeout and add a small
       # grace period
-      sleep(Sidekiq.options[:timeout] + 5)
+      sleep(Sidekiq[:timeout] + 5)
 
       # Signaling the Sidekiq Pgroup as KILL is not forwarded to
       # a possible child process. In Sidekiq Cluster, all child Sidekiq
diff --git a/config/initializers/types.rb b/config/initializers/types.rb
new file mode 100644
index 00000000000..4a20e257469
--- /dev/null
+++ b/config/initializers/types.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+ActiveRecord::Type.register(:sym_jsonb, Gitlab::Database::Type::SymbolizedJsonb)
diff --git a/config/initializers/zz_metrics.rb b/config/initializers/zz_metrics.rb
index 940d8eed61f..ff3ae9a2467 100644
--- a/config/initializers/zz_metrics.rb
+++ b/config/initializers/zz_metrics.rb
@@ -40,8 +40,9 @@ if Gitlab::Metrics.enabled? && !Rails.env.test? && !(Rails.env.development? && d
   if Gitlab::Runtime.puma?
     Gitlab::Metrics::RequestsRackMiddleware.initialize_metrics
     Gitlab::Metrics::GlobalSearchSlis.initialize_slis!
-  elsif Gitlab.ee? && Gitlab::Runtime.sidekiq?
-    Gitlab::Metrics::GlobalSearchIndexingSlis.initialize_slis!
+  elsif Gitlab::Runtime.sidekiq?
+    Gitlab::Metrics::GlobalSearchIndexingSlis.initialize_slis! if Gitlab.ee?
+    Gitlab::Metrics::LooseForeignKeysSlis.initialize_slis!
   end
 
   GC::Profiler.enable
diff --git a/config/initializers_before_autoloader/000_inflections.rb b/config/initializers_before_autoloader/000_inflections.rb
index dfd33938611..795b0f20128 100644
--- a/config/initializers_before_autoloader/000_inflections.rb
+++ b/config/initializers_before_autoloader/000_inflections.rb
@@ -17,6 +17,7 @@ ActiveSupport::Inflector.inflections do |inflect|
     award_emoji
     ci_secure_file_registry
     container_repository_registry
+    dependency_proxy_blob_registry
     design_registry
     event_log
     file_registry
@@ -30,6 +31,7 @@ ActiveSupport::Inflector.inflections do |inflect|
     pipeline_artifact_registry
     project_auto_devops
     project_registry
+    project_wiki_repository_registry
     project_statistics
     snippet_repository_registry
     system_note_metadata
diff --git a/config/locales/doorkeeper.zh-cn.yml b/config/locales/doorkeeper.zh-cn.yml
new file mode 100644
index 00000000000..f9b37c43866
--- /dev/null
+++ b/config/locales/doorkeeper.zh-cn.yml
@@ -0,0 +1,122 @@
+zh-CN:
+  activerecord:
+    errors:
+      models:
+        application:
+          attributes:
+            redirect_uri:
+              fragment_present: '不能包含片段。'
+              invalid_uri: '必须是一个有效的 URI。'
+              relative_uri: '必须是一个绝对 URI。'
+  mongoid:
+    errors:
+      models:
+        application:
+          attributes:
+            redirect_uri:
+              fragment_present: '不能包含片段。'
+              invalid_uri: '必须是一个有效的 URI。'
+              relative_uri: '必须是一个绝对 URI。'
+  mongo_mapper:
+    errors:
+      models:
+        application:
+          attributes:
+            redirect_uri:
+              fragment_present: '不能包含片段。'
+              invalid_uri: '必须是一个有效的 URI。'
+              relative_uri: '必须是一个绝对 URI。'
+  doorkeeper:
+    errors:
+      messages:
+        # Common error messages
+        invalid_redirect_uri: '包含的重定向 URI 无效。'
+        unauthorized_client: '客户端无权使用此方法执行此请求。'
+        access_denied: '资源所有者或授权服务器拒绝了该请求。'
+        invalid_scope: '请求的范围无效、未知或格式不正确。'
+        server_error: '授权服务器遇到了意外情况，导致无法完成请求。'
+        unconfirmed_email: '在您登录之前，验证您的帐户配置文件中的电子邮件地址。'
+        temporarily_unavailable: '由于服务器临时超载或维护，授权服务器目前无法处理请求。'
+
+        #configuration error messages
+        credential_flow_not_configured: '由于 Doorkeeper.configure.resource_owner_from_credentials 未配置，资源所有者密码凭证授予工作流失败。'
+        resource_owner_authenticator_not_configured: '由于 Doorkeeper.configure.resource_owner_authenticator 未配置，资源所有者查找失败。'
+
+        # Access grant errors
+        unsupported_response_type: '授权服务器不支持此响应类型。'
+
+        # Access token errors
+        invalid_client: '由于未知客户端、不包括客户端身份验证或不支持的身份验证方法，客户端身份验证失败。'
+        invalid_grant: '所提供的授权无效、过期、被撤销、与授权请求中使用的重定向 URI 不匹配，或者已向另一个客户端发出。'
+        unsupported_grant_type: '授权服务器不支持授权授予类型。'
+
+        # Password Access token errors
+        invalid_resource_owner: '所提供的资源所有者凭证无效，或找不到资源所有者。'
+
+        invalid_request:
+          unknown: '该请求缺少一个必需的参数，包括一个不支持的参数值，或在其他方面是错误的。'
+          missing_param: '缺少所需的参数：%{value}。'
+          not_support_pkce: '无效的 code_verifier 参数。服务器不支持 pkce。'
+          request_not_authorized: '请求需要授权。授权请求所需的参数缺失或无效。'
+
+        invalid_token:
+          revoked: "访问令牌被撤销"
+          expired: "访问令牌过期"
+          unknown: "访问令牌无效"
+    scopes:
+      api: 访问经过验证的用户的 API
+      read_user: 读取已验证用户的个人信息
+      read_repository: 允许对仓库进行只读访问
+      write_repository: 允许对仓库进行读写访问
+      read_registry: 授予读取容器镜像库镜像的权限
+      openid: 使用 OpenID Connect 进行身份验证
+      sudo: 作为系统中的任何用户执行 API 操作
+      profile: 允许使用 OpenID Connect 只读访问用户的个人信息
+      email: 允许使用 OpenID Connect 只读访问用户的主要电子邮件地址
+    scope_desc:
+      api:
+        授予对 API 的完全读/写访问权，包括所有群组和项目、容器镜像库和软件包库。
+      read_api:
+        授予对 API 的读访问权，包括所有群组和项目、容器镜像库和软件包库。
+      read_user:
+        通过 /user API端点授予对通过身份验证的用户概要的只读访问权，该端点包括用户名、公共电子邮件和全名。还授予对 /users 下的只读 API 端点的访问权。
+      read_repository:
+        使用 Git-over-HTTP 或 Repository Files API 授予对私有项目仓库的只读访问权。
+      write_repository:
+        使用 Git-over-HTTP (不使用 API)授予对私有项目上的仓库的读写访问权。
+      read_registry:
+        授予对私有项目上的容器镜像库镜像的只读访问权。
+      write_registry:
+        授予对私有项目上的容器镜像库镜像的写访问权。
+      openid:
+        授予使用 OpenID Connect 与 GitLab 进行身份验证的权限。还提供对用户配置文件和组成员关系的只读访问权限。
+      sudo:
+        当以管理员用户身份进行身份验证时，授予作为系统中任何用户执行 API 操作的权限。
+      profile:
+        使用 OpenID Connect 授予对用户配置文件数据的只读访问权。
+      email:
+        使用 OpenID Connect 授予对用户主电子邮件地址的只读访问权。
+    project_access_token_scope_desc:
+      api:
+        授予对限定范围的项目 API 的完全读写访问权。
+      read_api:
+        授予对限定范围的项目 API 的读访问权。
+      read_repository:
+        允许只读访问（拉取）到仓库。
+      write_repository:
+        允许对仓库的读写访问（拉取、推送）。
+      read_registry:
+        如果项目是私有的且需要授权，则允许读取（拉取）容器镜像库镜像。
+      write_registry:
+        允许写访问（推送）到容器镜像库。
+    flash:
+      applications:
+        create:
+          notice: '创建应用成功。'
+        destroy:
+          notice: '删除应用成功。'
+        update:
+          notice: '更新应用成功。'
+      authorized_applications:
+        destroy:
+          notice: '应用被撤销访问权限。'
diff --git a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
index 28b876507a7..ca47e918461 100644
--- a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
+++ b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - design_action
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
index 9e1c5477bab..2a9353caf6a 100644
--- a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
+++ b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - wiki_action
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
index dcfe0bb5638..6f687b89560 100644
--- a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
+++ b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
@@ -3,7 +3,7 @@ data_category: operational
 key_path: usage_activity_by_stage_monthly.plan.projects_jira_active
 description: Distinct count of creator_id from projects with an active Jira integration.
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
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 9c2a821ea1d..ba6994ac23a 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
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.plan.projects_jira_dvcs_cloud_active
 description: Distinct count of creator_id from projects with an active Jira Cloud
   DVCS integration.
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integration
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
index 214dd882f1f..3d327b17de0 100644
--- a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.plan.projects_jira_dvcs_server_active
 description: Distinct count of creator_id from projects with an active Jira Server
   DVCS integration.
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integration
 product_category: integrations
 value_type: number
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 3db7aec4eab..4744976f4d1 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
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - project_action
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
index eaad616dbb5..153596352e7 100644
--- a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
+++ b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - git_write_action
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml b/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
index bb919257a57..d1b7a63db8e 100644
--- a/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_close_issue_monthly
 description: Number of users closing Jira issues by month
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml b/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
index efd75c178b3..cea761bd778 100644
--- a/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
+++ b/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_cross_reference_monthly
 description: Number of users that cross-referenced Jira issues by month
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
index 9f62f61a967..7b18f83973a 100644
--- a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.ecosystem_total_unique_counts_monthly
 description: Number of users for Jira and Slack by month
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml b/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
index d668067c0ff..01e2b9d0059 100644
--- a/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_issue_notification_monthly
 description: Calculated unique users to trigger a Slack message by performing an action on an issue by month
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml b/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
index f342e358301..d028a10c1a3 100644
--- a/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_push_notification_monthly
 description: Calculated unique users to trigger a Slack message by performing a Git push by month
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml b/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
index daa96258a11..2b8f4166e6b 100644
--- a/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_deployment_notification_monthly
 description: Calculated unique users to trigger a Slack message by performing a deployment by month
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml b/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
index d8852ab90bd..7b5515f99a5 100644
--- a/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_wiki_page_notification_monthly
 description: Calculated unique users to trigger a Slack message by performing an action on a wiki page by month
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml b/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
index 9b485c7c39d..7229d9b0803 100644
--- a/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_merge_request_notification_monthly
 description: Calculated unique users to trigger a Slack message by performing an action on a merge request by month
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml b/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
index f407a19aab3..bd2269d1680 100644
--- a/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_note_notification_monthly
 description: Calculated unique users to trigger a Slack message by creating a note by month
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml b/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
index f815f161859..73fa05ac498 100644
--- a/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_tag_push_notification_monthly
 description: Calculated unique users to trigger a Slack message by performing a tag push by month
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml b/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
index b8485c38da2..5cb154ad6e4 100644
--- a/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_confidential_note_notification_monthly
 description: Calculated unique users to trigger a Slack message by creating a confidential note by month
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml b/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
index 023bf9955b9..bcd3147e9ea 100644
--- a/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_confidential_issue_notification_monthly
 description: Calculated unique users to trigger a Slack message by performing an action on a confidential issue by month
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_28d/20220222215951_xmau_plan.yml b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
index c254ad942c2..70cc27b801c 100644
--- a/config/metrics/counts_28d/20220222215951_xmau_plan.yml
+++ b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
@@ -22,6 +22,8 @@ options:
     - users_updating_work_item_dates
     - users_updating_work_item_labels
     - users_updating_work_item_iteration
+    - users_updating_weight_estimate
+    - users_updating_work_item_milestone
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
index 0dad4fd0979..13a943c972c 100644
--- a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
+++ b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
@@ -22,6 +22,8 @@ options:
     - users_updating_work_item_dates
     - users_updating_work_item_labels
     - users_updating_work_item_iteration
+    - users_updating_weight_estimate
+    - users_updating_work_item_milestone
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20220222215955_users_work_items.yml b/config/metrics/counts_28d/20220222215955_users_work_items.yml
index ec07fb25f11..cb3dc63035f 100644
--- a/config/metrics/counts_28d/20220222215955_users_work_items.yml
+++ b/config/metrics/counts_28d/20220222215955_users_work_items.yml
@@ -22,6 +22,8 @@ options:
     - users_updating_work_item_dates
     - users_updating_work_item_labels
     - users_updating_work_item_iteration
+    - users_updating_weight_estimate
+    - users_updating_work_item_milestone
 data_category: optional
 distribution:
 - ce
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 3282a4db173..06b1cbcc3cc 100644
--- a/config/metrics/counts_28d/20220621085114_unique_active_users_monthly.yml
+++ b/config/metrics/counts_28d/20220621085114_unique_active_users_monthly.yml
@@ -10,7 +10,7 @@ milestone: "15.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90468/
 time_frame: 28d
 data_source: redis_hll
-data_category: optional
+data_category: operational
 instrumentation_class: RedisHLLMetric
 options:
   events:
diff --git a/config/metrics/counts_28d/20220707022802_users_updating_weight_estimate_monthly.yml b/config/metrics/counts_28d/20220707022802_users_updating_weight_estimate_monthly.yml
new file mode 100644
index 00000000000..88fc09b6cc2
--- /dev/null
+++ b/config/metrics/counts_28d/20220707022802_users_updating_weight_estimate_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.work_items.users_updating_weight_estimate_monthly
+name: users_updating_weight_estimate_monthly
+description: Unique users updating a work item's weight estimate
+product_category: team_planning
+product_section: dev
+product_stage: plan
+product_group: project_management
+value_type: number
+status: active
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91957
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - users_updating_weight_estimate
+distribution:
+- ce
+- ee
+tier:
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml b/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml
new file mode 100644
index 00000000000..02edb32765e
--- /dev/null
+++ b/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.work_items.users_updating_work_item_milestone_monthly
+description: Unique users updating a work item's milestone
+product_section: dev
+product_stage: plan
+product_group: project_management
+product_category: team_planning
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102495
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_updating_work_item_milestone
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101190915_i_testing_coverage_report_uploaded_monthly.yml b/config/metrics/counts_28d/20221101190915_i_testing_coverage_report_uploaded_monthly.yml
new file mode 100644
index 00000000000..ef51a24bc1e
--- /dev/null
+++ b/config/metrics/counts_28d/20221101190915_i_testing_coverage_report_uploaded_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.testing.i_testing_coverage_report_uploaded_monthly
+description: "MAU of coverage test reports uploaded by customers per pipeline"
+product_section: ops
+product_stage: verify
+product_group: pipeline_insights
+product_category: testing
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102371
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_testing_coverage_report_uploaded
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml b/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml
new file mode 100644
index 00000000000..5987bde2d14
--- /dev/null
+++ b/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml
@@ -0,0 +1,22 @@
+---
+key_path: usage_activity_by_stage_monthly.create.merge_request_authors_monthly
+description: Number of unique merge request authors
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103334
+time_frame: 28d
+data_source: database
+data_category: optional
+instrumentation_class: CountMergeRequestAuthorsMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
index 7bc0d698f3a..03ea343b1da 100644
--- a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
@@ -10,8 +10,11 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: redis_hll
-instrumentation_class: RedisHLLMetric
+instrumentation_class: AggregatedMetric
 options:
+  aggregate:
+    operator: OR
+    attribute: user_id
   events:
   - incident_management_incident_created
   - incident_management_incident_reopened
diff --git a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
index 19bb7f0ba3c..967e8e5888e 100644
--- a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
@@ -27,6 +27,7 @@ options:
   - i_package_pypi_deploy_token
   - i_package_rubygems_deploy_token
   - i_package_terraform_module_deploy_token
+  - i_package_rpm_deploy_token
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
index 2b433855670..b650f2ff5fa 100644
--- a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_close_issue_weekly
 description: Number of users closing Jira issues by week
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
index aa3c99eab67..4058804272b 100644
--- a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
+++ b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_cross_reference_weekly
 description: Number of users that cross-referenced Jira issues by week
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
index 350a7032493..968525a9005 100644
--- a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.ecosystem_total_unique_counts_weekly
 description: Number of users performing actions on Jira issues by week
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
index fac4c52904a..3a7cee3cc4f 100644
--- a/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_issue_notification_weekly
 description: Calculated unique users to trigger a Slack message by performing an action on an issue by week
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
index bac63e461c9..6c10ec49dfe 100644
--- a/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_push_notification_weekly
 description: Calculated unique users to trigger a Slack message by performing a Git push by week
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
index 30ee2e05a18..f26b088c356 100644
--- a/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_deployment_notification_weekly
 description: Calculated unique users to trigger a Slack message by performing a deployment by week
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
index 54ff97eeb13..dc0bf804080 100644
--- a/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_wiki_page_notification_weekly
 description: Calculated unique users to trigger a Slack message by performing an action on a wiki page by week
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
index 4a2a99f8282..b27cec15caa 100644
--- a/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_merge_request_notification_weekly
 description: Calculated unique users to trigger a Slack message by performing an action on a merge request by week
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
index 559940a3be9..d56eec656ae 100644
--- a/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_note_notification_weekly
 description: Calculated unique users to trigger a Slack message by creating a note by week
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
index a029e1b30c4..671a2f4ac58 100644
--- a/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_tag_push_notification_weekly
 description: Calculated unique users to trigger a Slack message by performing a tag push by week
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
index b278b731c7d..3a80c12cdd1 100644
--- a/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_confidential_note_notification_weekly
 description: Calculated unique users to trigger a Slack message by creating a confidential note by week
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
index fe0a2011392..addaed1b2c1 100644
--- a/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_confidential_issue_notification_weekly
 description: Calculated unique users to trigger a Slack message by performing an action on a confidential issue by week
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml b/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml
index d1021ed4c0b..06952dd2050 100644
--- a/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml
@@ -3,7 +3,7 @@ key_path: counts.templates_gitlab_slack_application_active
 name: count_templates_gitlab_slack_application_active
 description: Count templates with active slack application
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_7d/20220222215851_xmau_plan.yml b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
index 77325a205ee..4520652ddf1 100644
--- a/config/metrics/counts_7d/20220222215851_xmau_plan.yml
+++ b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
@@ -22,6 +22,8 @@ options:
     - users_updating_work_item_dates
     - users_updating_work_item_labels
     - users_updating_work_item_iteration
+    - users_updating_weight_estimate
+    - users_updating_work_item_milestone
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
index c7e712cf92a..59543e71dcb 100644
--- a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
+++ b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
@@ -22,6 +22,8 @@ options:
     - users_updating_work_item_dates
     - users_updating_work_item_labels
     - users_updating_work_item_iteration
+    - users_updating_weight_estimate
+    - users_updating_work_item_milestone
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20220222215855_users_work_items.yml b/config/metrics/counts_7d/20220222215855_users_work_items.yml
index 0985f38c83b..6dc426231e9 100644
--- a/config/metrics/counts_7d/20220222215855_users_work_items.yml
+++ b/config/metrics/counts_7d/20220222215855_users_work_items.yml
@@ -22,6 +22,8 @@ options:
     - users_updating_work_item_dates
     - users_updating_work_item_labels
     - users_updating_work_item_iteration
+    - users_updating_weight_estimate
+    - users_updating_work_item_milestone
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20220707022758_users_updating_weight_estimate_weekly.yml b/config/metrics/counts_7d/20220707022758_users_updating_weight_estimate_weekly.yml
new file mode 100644
index 00000000000..17486482ad1
--- /dev/null
+++ b/config/metrics/counts_7d/20220707022758_users_updating_weight_estimate_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.work_items.users_updating_weight_estimate_weekly
+name: users_updating_weight_estimate_weekly
+description: Unique users updating a work item's weight estimate
+product_category: team_planning
+product_section: dev
+product_stage: plan
+product_group: project_management
+value_type: number
+status: active
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91957
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - users_updating_weight_estimate
+distribution:
+- ce
+- ee
+tier:
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220909143617_i_package_rpm_user_weekly.yml b/config/metrics/counts_7d/20220909143617_i_package_rpm_user_weekly.yml
new file mode 100644
index 00000000000..895e6c3cf91
--- /dev/null
+++ b/config/metrics/counts_7d/20220909143617_i_package_rpm_user_weekly.yml
@@ -0,0 +1,25 @@
+---
+data_category: optional
+key_path: redis_hll_counters.user_packages.i_package_rpm_user_weekly
+description: A weekly count of users that have published an rpm package to the registry
+product_section: ops
+product_stage: package
+product_group: package
+product_category: package_registry
+value_type: number
+status: active
+milestone: '15.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97133
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - i_package_rpm_user
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220913104805_i_package_rpm_deploy_token_weekly.yml b/config/metrics/counts_7d/20220913104805_i_package_rpm_deploy_token_weekly.yml
new file mode 100644
index 00000000000..37f539d1ec4
--- /dev/null
+++ b/config/metrics/counts_7d/20220913104805_i_package_rpm_deploy_token_weekly.yml
@@ -0,0 +1,25 @@
+---
+data_category: optional
+key_path: redis_hll_counters.deploy_token_packages.i_package_rpm_deploy_token_weekly
+description: A weekly count of RPM packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: package
+product_category: package_registry
+value_type: number
+status: active
+milestone: '15.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97133
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - i_package_rpm_deploy_token
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml b/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml
new file mode 100644
index 00000000000..a06f0a5bdbe
--- /dev/null
+++ b/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.work_items.users_updating_work_item_milestone_weekly
+description: Unique users updating a work item's milestone
+product_section: dev
+product_stage: plan
+product_group: project_management
+product_category: team_planning
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102495
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_updating_work_item_milestone
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101190913_i_testing_coverage_report_uploaded_weekly.yml b/config/metrics/counts_7d/20221101190913_i_testing_coverage_report_uploaded_weekly.yml
new file mode 100644
index 00000000000..be6ba98c10c
--- /dev/null
+++ b/config/metrics/counts_7d/20221101190913_i_testing_coverage_report_uploaded_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.testing.i_testing_coverage_report_uploaded_weekly
+description: "MAU of coverage test reports uploaded by customers per pipeline"
+product_section: ops
+product_stage: verify
+product_group: pipeline_insights
+product_category: testing
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102371
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_testing_coverage_report_uploaded
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175621_web_hooks.yml b/config/metrics/counts_all/20210216175621_web_hooks.yml
index 8614e7d4be6..416c4f739e9 100644
--- a/config/metrics/counts_all/20210216175621_web_hooks.yml
+++ b/config/metrics/counts_all/20210216175621_web_hooks.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.web_hooks
 description: Count of web hooks
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category:
 value_type: number
diff --git a/config/metrics/counts_all/20210216175623_projects_asana_active.yml b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
index 5b6e4ece343..f5d77814ff9 100644
--- a/config/metrics/counts_all/20210216175623_projects_asana_active.yml
+++ b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_asana_active
 description: Count of projects with active integrations for Asana
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175625_groups_asana_active.yml b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
index 87269b04570..e2ee8440616 100644
--- a/config/metrics/counts_all/20210216175625_groups_asana_active.yml
+++ b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_asana_active
 description: Count of groups with active integrations for Asana
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175627_templates_asana_active.yml b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
index 121409c5b7f..0fc5c5321ef 100644
--- a/config/metrics/counts_all/20210216175627_templates_asana_active.yml
+++ b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_asana_active
 description: Count of active service templates for Asana
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175628_instances_asana_active.yml b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
index 0a5c5fa1242..70047243025 100644
--- a/config/metrics/counts_all/20210216175628_instances_asana_active.yml
+++ b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_asana_active
 description: Count of active instance-level integrations for Asana
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
index be27b267acd..e5bd8119cef 100644
--- a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_asana_active
 description: Count of active projects inheriting integrations for Asana
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
index 06bb348d677..df2237ce08d 100644
--- a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_asana_active
 description: Count of active groups inheriting integrations for Asana
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
index ad6ae1afc72..d5e61e86f48 100644
--- a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_assembla_active
 description: Count of projects with active integrations for Assembla
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
index a9a1ba26633..d3b8252b5bf 100644
--- a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_assembla_active
 description: Count of groups with active integrations for Assembla
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
index 88d0c631218..0faa5a7f435 100644
--- a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_assembla_active
 description: Count of active service templates for Assembla
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
index c76d508d58c..1fcf673aba2 100644
--- a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_assembla_active
 description: Count of active instance-level integrations for Assembla
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
index 72143e165cc..f1d8dd731dd 100644
--- a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_assembla_active
 description: Count of active projects inheriting integrations for Assembla
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml b/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
index d22ac41c550..ebbdba6c097 100644
--- a/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_assembla_active
 description: Count of active groups inheriting integrations for Assembla
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
index 3ad3dfb25a9..7e1530aa6e6 100644
--- a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
@@ -3,7 +3,7 @@ data_category: operational
 key_path: counts.projects_bamboo_active
 description: Count of projects with active integrations for Bamboo CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
index e5543ca5766..cfc1d7d7f39 100644
--- a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_bamboo_active
 description: Count of groups with active integrations for Bamboo CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
index 96947738ac7..8965c65ed6f 100644
--- a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_bamboo_active
 description: Count of active service templates for Bamboo CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
index db0824288cd..b07649a858c 100644
--- a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_bamboo_active
 description: Count of active instance-level integrations for Bamboo CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
index 429540bdbd4..1fcd94588bf 100644
--- a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_bamboo_active
 description: Count of active projects inheriting integrations for Bamboo CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
index 19bc979b41e..b2216f34b48 100644
--- a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_bamboo_active
 description: Count of active groups inheriting integrations for Bamboo CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
index 39caf54919d..c6a0e9c4654 100644
--- a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_bugzilla_active
 description: Count of projects with active integrations for Bugzilla
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
index 2e3c1b5527f..1c4be08b4da 100644
--- a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_bugzilla_active
 description: Count of groups with active integrations for Bugzilla
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
index 12866071b53..41a36dfede4 100644
--- a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_bugzilla_active
 description: Count of active service templates for Bugzilla
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
index 55f5f38555a..bc9cc8c78c2 100644
--- a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_bugzilla_active
 description: Count of active instance-level integrations for Bugzilla
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml b/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
index be9231fcece..d034b007408 100644
--- a/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_bugzilla_active
 description: Count of active projects inheriting integrations for Bugzilla
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
index 699b9019dfc..b9b92f72f02 100644
--- a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_bugzilla_active
 description: Count of active groups inheriting integrations for Bugzilla
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
index 741b7220458..0c359862309 100644
--- a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_buildkite_active
 description: Count of projects with active integrations for Buildkite
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
index 1b334022e44..363671ad07e 100644
--- a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_buildkite_active
 description: Count of groups with active integrations for Buildkite
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
index d5a46ed861c..14ffea5ffb4 100644
--- a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_buildkite_active
 description: Count of active service templates for Buildkite
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
index 8d99d2c1f05..39451d3ae53 100644
--- a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_buildkite_active
 description: Count of active instance-level integrations for Buildkite
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
index fd54ff78891..a789fc50df4 100644
--- a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_buildkite_active
 description: Count of active projects inheriting integrations for Buildkite
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml b/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
index 350f74c97b7..f846e126f3e 100644
--- a/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_buildkite_active
 description: Count of active groups inheriting integrations for Buildkite
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
index 73d8a063f0b..816f153d252 100644
--- a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_campfire_active
 description: Count of projects with active integrations for Campfire
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
index c4879e4fd91..e87e0748062 100644
--- a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_campfire_active
 description: Count of groups with active integrations for Campfire
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
index b5b8b9905ca..00f32987f4e 100644
--- a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_campfire_active
 description: Count of active service templates for Campfire
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
index 88a013fff2f..a2c18935954 100644
--- a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_campfire_active
 description: Count of active instance-level integrations for Campfire
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml b/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
index 51150db3bdd..a09a7f7cb4e 100644
--- a/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_campfire_active
 description: Count of active projects inheriting integrations for Campfire
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
index f081a57eff4..55780ebfef1 100644
--- a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_campfire_active
 description: Count of active groups inheriting integrations for Campfire
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
index c361af80c75..ec23eae4aad 100644
--- a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_confluence_active
 description: Count of projects with active integrations for Confluence
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
index 8a9d3e4aa2b..ae6caba5551 100644
--- a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_confluence_active
 description: Count of groups with active integrations for Confluence
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
index 5b09f81d9f7..720325f1ee9 100644
--- a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_confluence_active
 description: Count of active service templates for Confluence
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
index f8df0b86ffd..521f29949c1 100644
--- a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_confluence_active
 description: Count of active instance-level integrations for Confluence
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
index c59ba1dd8f8..1fc45db4903 100644
--- a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_confluence_active
 description: Count of active projects inheriting integrations for Confluence
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
index 2242a04f332..e9c0d456ab0 100644
--- a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_confluence_active
 description: Count of active groups inheriting integrations for Confluence
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
index a727e6fedb6..f3ee6b40bce 100644
--- a/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_custom_issue_tracker_active
 description: Count of projects with active integrations for a Custom Issue Tracker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
index 4c63579d92e..c9b11d6c5e9 100644
--- a/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_custom_issue_tracker_active
 description: Count of groups with active integrations for a Custom Issue Tracker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
index b1f0c7955ff..110f6cc9606 100644
--- a/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_custom_issue_tracker_active
 description: Count of active service templates for a Custom Issue Tracker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
index a87c20b1e8b..ae72b015264 100644
--- a/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_custom_issue_tracker_active
 description: Count of active instance-level integrations for a Custom Issue Tracker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
index 1ef220f5e4f..22b6fbfe846 100644
--- a/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_custom_issue_tracker_active
 description: Count of active projects inheriting integrations for a Custom Issue Tracker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
index 0ff7a037288..a047b76b5cb 100644
--- a/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_custom_issue_tracker_active
 description: Count of active groups inheriting integrations for a Custom Issue Tracker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175753_projects_discord_active.yml b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
index 9b4eecbd372..a228c98c52f 100644
--- a/config/metrics/counts_all/20210216175753_projects_discord_active.yml
+++ b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_discord_active
 description: Count of projects with active integrations for Discord
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175755_groups_discord_active.yml b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
index 7ac463d87e3..86ffb00edc4 100644
--- a/config/metrics/counts_all/20210216175755_groups_discord_active.yml
+++ b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_discord_active
 description: Count of groups with active integrations for Discord
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175756_templates_discord_active.yml b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
index 4b913f35acd..47d111dc895 100644
--- a/config/metrics/counts_all/20210216175756_templates_discord_active.yml
+++ b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_discord_active
 description: Count of active service templates for Discord
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175758_instances_discord_active.yml b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
index 5d790f5d6df..d508e171a7a 100644
--- a/config/metrics/counts_all/20210216175758_instances_discord_active.yml
+++ b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_discord_active
 description: Count of active instance-level integrations for Discord
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml b/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
index 85634cb58b2..478151f1889 100644
--- a/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_discord_active
 description: Count of active projects inheriting integrations for Discord
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
index 74f1c4a32f5..1016a71b1c8 100644
--- a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_discord_active
 description: Count of active groups inheriting integrations for Discord
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
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 005d9f65a33..e8511564bdd 100644
--- a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
@@ -3,7 +3,7 @@ data_category: operational
 key_path: counts.projects_drone_ci_active
 description: Count of projects with active integrations for Drone CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml b/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
index 23b4fab18b3..3a5ce0f3882 100644
--- a/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_drone_ci_active
 description: Count of groups with active integrations for Drone CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
index e3422fb6193..80e017c5a2c 100644
--- a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_drone_ci_active
 description: Count of active service templates for Drone CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml b/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
index a47163d7540..b071268f48c 100644
--- a/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_drone_ci_active
 description: Count of active instance-level integrations for Drone CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml b/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
index ee862f15d30..b9fafd7d3c8 100644
--- a/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_drone_ci_active
 description: Count of active projects inheriting integrations for Drone CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml b/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
index aafc802b87c..60b5c5bf7c8 100644
--- a/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_drone_ci_active
 description: Count of active groups inheriting integrations for Drone CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml b/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
index 1ba9979c98a..47f094738d0 100644
--- a/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_emails_on_push_active
 description: Count of projects with active integrations for Emails on Push
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml b/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
index 6049a9126a7..7c67463eba3 100644
--- a/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_emails_on_push_active
 description: Count of groups with active integrations for Emails on Push
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
index 33e588ce60e..387874eb108 100644
--- a/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_emails_on_push_active
 description: Count of active service templates for Emails on Push
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml b/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
index 40ab3459baf..a1588510b2b 100644
--- a/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_emails_on_push_active
 description: Count of active instance-level integrations for Emails on Push
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml b/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
index 5df16d4bcaf..892249b795d 100644
--- a/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_emails_on_push_active
 description: Count of active projects inheriting integrations for Emails on Push
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml b/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
index c478fc02745..a02c183202d 100644
--- a/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_emails_on_push_active
 description: Count of active groups inheriting integrations for Emails on Push
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml b/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
index fc99b7a20cc..f2d71a1a775 100644
--- a/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_external_wiki_active
 description: Count of projects with active integrations for External Wiki
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
index d154a4ec723..e7cb654e8e5 100644
--- a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_external_wiki_active
 description: Count of groups with active integrations for External Wiki
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
index 522315e40f6..b80bb0e6902 100644
--- a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_external_wiki_active
 description: Count of active service templates for External Wiki
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml b/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
index 9d5e41f4302..fbc863ee474 100644
--- a/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_external_wiki_active
 description: Count of active instance-level integrations for External Wiki
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml b/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
index 166d7f1734b..f27b94f9b54 100644
--- a/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_external_wiki_active
 description: Count of active projects inheriting integrations for External Wiki
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml b/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
index c233df8e8ff..7f6ca0a013b 100644
--- a/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_external_wiki_active
 description: Count of active groups inheriting integrations for External Wiki
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
index 0ca23369618..46db9f97e85 100644
--- a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_flowdock_active
 description: Count of projects with active integrations for Flowdock
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
index 878a6b1615a..d5da36978b6 100644
--- a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_flowdock_active
 description: Count of groups with active integrations for Flowdock
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
index 19bd891b300..d3ed9f36425 100644
--- a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_flowdock_active
 description: Count of active service templates for Flowdock
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
index 2b58b35d466..198af43a99d 100644
--- a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_flowdock_active
 description: Count of active instance-level integrations for Flowdock
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
index 88425a3aaff..f094f894ded 100644
--- a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_flowdock_active
 description: Count of active projects inheriting integrations for Flowdock
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
index 8c8150ec316..fb7931ddf09 100644
--- a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_flowdock_active
 description: Count of active groups inheriting integrations for Flowdock
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
index bdb36ce40a4..14865b2dffc 100644
--- a/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_hangouts_chat_active
 description: Count of projects with active integrations for Hangouts Chat
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
index ce776453c04..0dcb3881909 100644
--- a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_hangouts_chat_active
 description: Count of groups with active integrations for Hangouts Chat
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
index c41f72918d9..0d60c70c6e2 100644
--- a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_hangouts_chat_active
 description: Count of active service templates for Hangouts Chat
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
index 023893954f3..4208f647cf3 100644
--- a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_hangouts_chat_active
 description: Count of active instance-level integrations for Hangouts Chat
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
index 2a706665d8f..7168c788670 100644
--- a/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_hangouts_chat_active
 description: Count of active projects inheriting integrations for Hangouts Chat
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
index 8586fb00ab4..45465412b80 100644
--- a/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_hangouts_chat_active
 description: Count of active groups inheriting integrations for Hangouts Chat
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
index 779f0579f49..915c634cdb3 100644
--- a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_hipchat_active
 description: Count of projects with active integrations for HipChat
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
index 16419a7005b..5391dda3b7c 100644
--- a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_hipchat_active
 description: Count of groups with active integrations for HipChat
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
index 65516f0a17b..7bcb8206beb 100644
--- a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_hipchat_active
 description: Count of active service templates for HipChat
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
index 0c7c6c5ee99..f30e667b316 100644
--- a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_hipchat_active
 description: Count of active instance-level integrations for HipChat
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
index febbbf234aa..aef3e97590f 100644
--- a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_hipchat_active
 description: Count of active projects inheriting integrations for HipChat
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
index df5bc192dfd..ff4e3d9d0b3 100644
--- a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_hipchat_active
 description: Count of active groups inheriting integrations for HipChat
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175921_projects_irker_active.yml b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
index c23511b99b0..0a01091482f 100644
--- a/config/metrics/counts_all/20210216175921_projects_irker_active.yml
+++ b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_irker_active
 description: Count of projects with active integrations for Irker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175923_groups_irker_active.yml b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
index efb8317fd4a..12faf9b8871 100644
--- a/config/metrics/counts_all/20210216175923_groups_irker_active.yml
+++ b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_irker_active
 description: Count of groups with active integrations for Irker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175924_templates_irker_active.yml b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
index 6075daa321b..1717439aad6 100644
--- a/config/metrics/counts_all/20210216175924_templates_irker_active.yml
+++ b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_irker_active
 description: Count of active service templates for Irker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175926_instances_irker_active.yml b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
index e2821326503..edb31b01c5e 100644
--- a/config/metrics/counts_all/20210216175926_instances_irker_active.yml
+++ b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_irker_active
 description: Count of active instance-level integrations for Irker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml b/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
index bce07c5c584..5aab65d8491 100644
--- a/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_irker_active
 description: Count of active projects inheriting integrations for Irker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
index c99e8ed3d01..d724dccbd82 100644
--- a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_irker_active
 description: Count of active groups inheriting integrations for Irker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
index 7e71a319c67..85eb568a586 100644
--- a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
@@ -3,7 +3,7 @@ data_category: operational
 key_path: counts.projects_jenkins_active
 description: Count of projects with active integrations for Jenkins
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
index 5db9b4b46a9..336eea6884a 100644
--- a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_jenkins_active
 description: Count of groups with active integrations for Jenkins
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
index 0205e0497bf..3475c1d4046 100644
--- a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_jenkins_active
 description: Count of active service templates for Jenkins
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
index 4135f36bd0a..a587373aa24 100644
--- a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_jenkins_active
 description: Count of active instance-level integrations for Jenkins
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
index 82f93fa3bcd..8670bf8ccc2 100644
--- a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_jenkins_active
 description: Count of active projects inheriting integrations for Jenkins
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
index 7b01ab9e25a..1cb7931cf48 100644
--- a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_jenkins_active
 description: Count of active groups inheriting integrations for Jenkins
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175943_projects_jira_active.yml b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
index ac627472066..adfaacfae0a 100644
--- a/config/metrics/counts_all/20210216175943_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
@@ -3,7 +3,7 @@ data_category: operational
 key_path: counts.projects_jira_active
 description: Count of projects with active integrations for Jira
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175945_groups_jira_active.yml b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
index d99920be62a..3464df2ef60 100644
--- a/config/metrics/counts_all/20210216175945_groups_jira_active.yml
+++ b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_jira_active
 description: Count of groups with active integrations for Jira
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175946_templates_jira_active.yml b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
index 63c1929b00e..a77057f5a53 100644
--- a/config/metrics/counts_all/20210216175946_templates_jira_active.yml
+++ b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_jira_active
 description: Count of active service templates for Jira
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175948_instances_jira_active.yml b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
index 98d1d27bed7..444f1c79ca9 100644
--- a/config/metrics/counts_all/20210216175948_instances_jira_active.yml
+++ b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_jira_active
 description: Count of active instance-level integrations for Jira
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
index af8e8414beb..4a0097e21ba 100644
--- a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_jira_active
 description: Count of active projects inheriting integrations for Jira
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml b/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
index 3e9531cba26..6ff87cde23f 100644
--- a/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_jira_active
 description: Count of active groups inheriting integrations for Jira
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
index b02c9e4919f..4d351b42abb 100644
--- a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_mattermost_active
 description: Count of projects with active integrations for Mattermost
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
index cdf2962548c..8036eff1e67 100644
--- a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_mattermost_active
 description: Count of groups with active integrations for Mattermost
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
index ced52649fd3..c4cc0f0d9c7 100644
--- a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_mattermost_active
 description: Count of active service templates for Mattermost
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
index 519039cb6c2..cdde4ac4027 100644
--- a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_mattermost_active
 description: Count of active instance-level integrations for Mattermost
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml b/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
index 40a9e3f3eac..240a59a8b1e 100644
--- a/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_mattermost_active
 description: Count of active projects inheriting integrations for Mattermost
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml b/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
index eea105726c1..f7bb7cb1a3e 100644
--- a/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_mattermost_active
 description: Count of active groups inheriting integrations for Mattermost
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
index 36cdffa264b..d2a787ffa32 100644
--- a/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_mattermost_slash_commands_active
 description: Count of projects with active integrations for Mattermost (slash commands)
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
index 5356bbad505..6b8c43319c6 100644
--- a/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_mattermost_slash_commands_active
 description: Count of groups with active integrations for Mattermost (slash commands)
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
index 9851fc82dcd..a9703666f63 100644
--- a/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_mattermost_slash_commands_active
 description: Count of active service templates for Mattermost (slash commands)
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
index 08026f0a267..0e498eaf251 100644
--- a/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_mattermost_slash_commands_active
 description: Count of active instance-level integrations for Mattermost (slash commands)
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
index 08ea0768dcd..5f498994eb6 100644
--- a/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_mattermost_slash_commands_active
 description: Count of active projects inheriting integrations for Mattermost (slash
   commands)
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
index 0458c912d4f..804100472b8 100644
--- a/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_mattermost_slash_commands_active
 description: Count of active groups inheriting integrations for Mattermost (slash
   commands)
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
index 60dece28890..6b517b8ea65 100644
--- a/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_microsoft_teams_active
 description: Count of projects with active integrations for Microsoft Teams
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
index b6ff5d7e4a3..75bc1c38b85 100644
--- a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_microsoft_teams_active
 description: Count of groups with active integrations for Microsoft Teams
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
index f3b96753b7b..0bd44801ce0 100644
--- a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_microsoft_teams_active
 description: Count of active service templates for Microsoft Teams
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
index 04c89b9544c..e5fbd0dd3b6 100644
--- a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_microsoft_teams_active
 description: Count of active instance-level integrations for Microsoft Teams
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
index 0a9c6e8f2d5..de36020f9e5 100644
--- a/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_microsoft_teams_active
 description: Count of active projects inheriting integrations for Microsoft Teams
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
index 430438fa682..0f17bfc7fb4 100644
--- a/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_microsoft_teams_active
 description: Count of active groups inheriting integrations for Microsoft Teams
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
index 2d6da6dd87c..f598ea26661 100644
--- a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_packagist_active
 description: Count of projects with active integrations for Packagist
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
index 72d22778e35..25feaa36b23 100644
--- a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_packagist_active
 description: Count of groups with active integrations for Packagist
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
index 83e0d46c6b8..61d0d5e1341 100644
--- a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_packagist_active
 description: Count of active service templates for Packagist
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
index f79210d6870..7cf1c495a94 100644
--- a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_packagist_active
 description: Count of active instance-level integrations for Packagist
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml b/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
index 0dfdbd5b610..cc61aeab951 100644
--- a/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_packagist_active
 description: Count of active projects inheriting integrations for Packagist
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml b/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
index 21b7b80ec17..87e89a24f0b 100644
--- a/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_packagist_active
 description: Count of active groups inheriting integrations for Packagist
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml b/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
index b1f315903a6..e23ac62c864 100644
--- a/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_pipelines_email_active
 description: Count of projects with active integrations for Pipeline Emails
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
index b3e5ff8ea4c..8e969cd2254 100644
--- a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_pipelines_email_active
 description: Count of groups with active integrations for Pipeline Emails
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
index ad3ed4311ff..9fccfbfb67e 100644
--- a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_pipelines_email_active
 description: Count of active service templates for Pipeline Emails
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
index c815050bec2..253d76935dd 100644
--- a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_pipelines_email_active
 description: Count of active instance-level integrations for Pipeline Emails
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml b/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
index 04cff98babb..c43f3484f35 100644
--- a/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_pipelines_email_active
 description: Count of active projects inheriting integrations for Pipeline Emails
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml b/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
index 1408f2084b8..4e03c0cf990 100644
--- a/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_pipelines_email_active
 description: Count of active groups inheriting integrations for Pipeline Emails
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
index 312e0c0dd93..39be8cbf49c 100644
--- a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_pivotaltracker_active
 description: Count of projects with active integrations for Pivotal Tracker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
index 2d1d3110957..ef3d5627379 100644
--- a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_pivotaltracker_active
 description: Count of groups with active integrations for Pivotal Tracker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
index 338fa4f6adc..b54e62f535c 100644
--- a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_pivotaltracker_active
 description: Count of active service templates for Pivotal Tracker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
index 8e6590c031c..931c9b981f6 100644
--- a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_pivotaltracker_active
 description: Count of active instance-level integrations for Pivotal Tracker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
index 14f61d6c3e2..beaf20266af 100644
--- a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_pivotaltracker_active
 description: Count of active projects inheriting integrations for Pivotal Tracker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
index 9dfa4d23021..55f9346ac0f 100644
--- a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_pivotaltracker_active
 description: Count of active groups inheriting integrations for Pivotal Tracker
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
index 85f9bfdf6c6..7f6a57168d9 100644
--- a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_pushover_active
 description: Count of projects with active integrations for Pushover
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
index ab43af5212f..897c531a6f7 100644
--- a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_pushover_active
 description: Count of groups with active integrations for Pushover
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
index 7ba07c02ded..1f0cca6305d 100644
--- a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_pushover_active
 description: Count of active service templates for Pushover
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
index 362873d1d7b..bfaf2726283 100644
--- a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_pushover_active
 description: Count of active instance-level integrations for Pushover
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
index b8c567b02bf..a71e5f50fb1 100644
--- a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_pushover_active
 description: Count of active projects inheriting integrations for Pushover
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml b/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
index a587a6ab81c..c08a8f4cc90 100644
--- a/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_pushover_active
 description: Count of active groups inheriting integrations for Pushover
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
index bcb72acdf48..c058489c438 100644
--- a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_redmine_active
 description: Count of projects with active integrations for Redmine
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
index ab31eb0ec82..95c566730bb 100644
--- a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_redmine_active
 description: Count of groups with active integrations for Redmine
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
index 7bddca755ec..c3806d83cf9 100644
--- a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_redmine_active
 description: Count of active service templates for Redmine
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
index 2e1cd17c20f..c6990f3a55d 100644
--- a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_redmine_active
 description: Count of active instance-level integrations for Redmine
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
index ba6aacb1d0a..968b5a2c71d 100644
--- a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_redmine_active
 description: Count of active projects inheriting integrations for Redmine
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml b/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
index c219ea9aa92..521ddf7e182 100644
--- a/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_redmine_active
 description: Count of active groups inheriting integrations for Redmine
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180122_projects_slack_active.yml b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
index 206d36548ad..a885f965100 100644
--- a/config/metrics/counts_all/20210216180122_projects_slack_active.yml
+++ b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_slack_active
 description: Count of projects with active integrations for Slack
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180124_groups_slack_active.yml b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
index 91bf70daa37..f7c35542615 100644
--- a/config/metrics/counts_all/20210216180124_groups_slack_active.yml
+++ b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_slack_active
 description: Count of groups with active integrations for Slack
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180126_templates_slack_active.yml b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
index aa90f12ab18..5253bed85ca 100644
--- a/config/metrics/counts_all/20210216180126_templates_slack_active.yml
+++ b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_slack_active
 description: Count of active service templates for Slack
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180127_instances_slack_active.yml b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
index 931404189d1..707d61aed19 100644
--- a/config/metrics/counts_all/20210216180127_instances_slack_active.yml
+++ b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_slack_active
 description: Count of active instance-level integrations for Slack
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
index 84552e83be8..f402f2b39d3 100644
--- a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_slack_active
 description: Count of active projects inheriting integrations for Slack
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
index ec48bd47db0..d83501b3273 100644
--- a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_slack_active
 description: Count of active groups inheriting integrations for Slack
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
index 790872db206..e0a75a66df5 100644
--- a/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_slack_slash_commands_active
 description: Count of projects with active integrations for Slack (slash commands)
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
index 5a820ea6ae7..d53b0333205 100644
--- a/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_slack_slash_commands_active
 description: Count of groups with active integrations for Slack (slash commands)
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
index 1718564975d..ce6a1ae807d 100644
--- a/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_slack_slash_commands_active
 description: Count of active service templates for Slack (slash commands)
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
index 9f6da9f0e7f..de0bd69b1d9 100644
--- a/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_slack_slash_commands_active
 description: Count of active instance-level integrations for Slack (slash commands)
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
index 7e8f209f625..cb3ae4b9b14 100644
--- a/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_slack_slash_commands_active
 description: Count of active projects inheriting integrations for Slack (slash commands)
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
index 4dfed91dc58..d075715daae 100644
--- a/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_slack_slash_commands_active
 description: Count of active groups inheriting integrations for Slack (slash commands)
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
index ad8d1afcc8e..10c1f56070a 100644
--- a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_teamcity_active
 description: Count of projects with active integrations for Teamcity CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
index 20deac7fe75..5171ab2c2d1 100644
--- a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_teamcity_active
 description: Count of groups with active integrations for Teamcity CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
index e1f01e57a31..b6845efeb28 100644
--- a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_teamcity_active
 description: Count of active service templates for Teamcity CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
index 32404539b74..00f423a9169 100644
--- a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_teamcity_active
 description: Count of active instance-level integrations for Teamcity CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
index daddf5ca1db..917579478b5 100644
--- a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_teamcity_active
 description: Count of active projects inheriting integrations for Teamcity CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml b/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
index 53879bc7462..5a82830dea5 100644
--- a/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_teamcity_active
 description: Count of active groups inheriting integrations for Teamcity CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
index 3b678d43017..6aa78eaabfd 100644
--- a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_unify_circuit_active
 description: Count of projects with active integrations for Unifiy Circuit
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
index 4d40f5a473d..623c2389073 100644
--- a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_unify_circuit_active
 description: Count of groups with active integrations for Unifiy Circuit
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
index 6e7c83ed6fc..47731d1b5b9 100644
--- a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_unify_circuit_active
 description: Count of active service templates for Unifiy Circuit
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
index 74f90bf006c..20deb22c0cb 100644
--- a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_unify_circuit_active
 description: Count of active instance-level integrations for Unifiy Circuit
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml b/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
index 0f3c151d505..d75f316c69c 100644
--- a/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_unify_circuit_active
 description: Count of active projects inheriting integrations for Unifiy Circuit
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml b/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
index af114532491..a4e9de64cc7 100644
--- a/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_unify_circuit_active
 description: Count of active groups inheriting integrations for Unifiy Circuit
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
index 07f5c5d5ce1..92d93cecdb5 100644
--- a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_webex_teams_active
 description: Count of projects with active integrations for Webex Teams
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml b/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
index 682e719a37c..4a40e435994 100644
--- a/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_webex_teams_active
 description: Count of groups with active integrations for Webex Teams
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
index ace629d4322..3360b45093e 100644
--- a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_webex_teams_active
 description: Count of active service templates for Webex Teams
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml b/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
index 2d75cb7bebe..a5e4dc2cfa6 100644
--- a/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_webex_teams_active
 description: Count of active instance-level integrations for Webex Teams
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml b/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
index b2527e738ca..2fe2a61187e 100644
--- a/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_webex_teams_active
 description: Count of active projects inheriting integrations for Webex Teams
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml b/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
index 5a59e20a5af..8a87a1cdc02 100644
--- a/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_webex_teams_active
 description: Count of active groups inheriting integrations for Webex Teams
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
index 3e65b2b28dd..a8625a464cb 100644
--- a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_youtrack_active
 description: Count of projects with active integrations for YouTrack
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
index 6c57b9e5c86..0ee62f379e8 100644
--- a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_youtrack_active
 description: Count of groups with active integrations for YouTrack
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
index 252c1724c48..9334ef68345 100644
--- a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_youtrack_active
 description: Count of active service templates for YouTrack
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
index e678f693ef4..24d6440afb6 100644
--- a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_youtrack_active
 description: Count of active instance-level integrations for YouTrack
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
index ffeecb454d2..cacc694f002 100644
--- a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_youtrack_active
 description: Count of active projects inheriting integrations for YouTrack
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml b/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
index c8874399e76..1286a306aef 100644
--- a/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_youtrack_active
 description: Count of active groups inheriting integrations for YouTrack
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
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 752f280dab3..cc000031e83 100644
--- a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
+++ b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
@@ -3,7 +3,7 @@ data_category: operational
 key_path: counts.projects_jira_server_active
 description: Count of active integrations with Jira Software (server)
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
index ceea89b7035..d607f3d6aea 100644
--- a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
@@ -3,7 +3,7 @@ data_category: operational
 key_path: counts.projects_jira_cloud_active
 description: Count of active integrations with Jira Cloud (Saas)
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
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 c98c7526f16..158e18a738e 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
@@ -3,7 +3,7 @@ data_category: operational
 key_path: counts.projects_jira_dvcs_cloud_active
 description: Count of active integrations with Jira Cloud (DVCS Connector)
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
index 9179ec898f3..a436d0dddae 100644
--- a/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
@@ -3,7 +3,7 @@ data_category: operational
 key_path: counts.projects_jira_dvcs_server_active
 description: Count of active integrations with Jira Software (DVCS connector)
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
index c2294650494..6b6f0e978ae 100644
--- a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
+++ b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
@@ -10,7 +10,9 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-instrumentation_class: DistinctCountProjectsWithExpirationPolicyDisabledMetric
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: false
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
index c5e5e7fffd1..3c49f82fa6b 100644
--- a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
+++ b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
@@ -10,6 +10,9 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
index 2a531707621..e9eaec20453 100644
--- a/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
+++ b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  keep_n: 1
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
index 4e9df93f171..b6bc610b97a 100644
--- a/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
+++ b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  keep_n: 5
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
index da0e5006521..906382f2e52 100644
--- a/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
+++ b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  keep_n: 10
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
index 84bce062d63..2ba5e503c81 100644
--- a/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
+++ b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  keep_n: 25
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
index 38579a1bdc2..faa4bb4ba8f 100644
--- a/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
+++ b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  keep_n: 50
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml b/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
index 69c59dd2262..bc2963db71f 100644
--- a/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
+++ b/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  keep_n: 100
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
index 1694127fd2c..2c6e2745560 100644
--- a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
+++ b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  cadence: 1d
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
index a9f8ed70c94..15be6b54bfd 100644
--- a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  cadence: 7d
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
index 7afc773b713..68d54c4ebe0 100644
--- a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  cadence: 14d
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
index b083411ab7f..fe620f1997c 100644
--- a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
+++ b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  cadence: 1month
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
index 0df858b127d..8b06790d4ac 100644
--- a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
+++ b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  cadence: 3month
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
index 6a98e4ecfd8..912e349a206 100644
--- a/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
+++ b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
@@ -11,6 +11,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  keep_n: null
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181126_projects_jira_active.yml b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
index 2bd0cdf62c3..54426bd92bf 100644
--- a/config/metrics/counts_all/20210216181126_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage.plan.projects_jira_active
 description: Distinct count of creator_id from projects with an active Jira integration.
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
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 9d17fd23fde..7ed8f79a5a7 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
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.plan.projects_jira_dvcs_cloud_active
 description: Distinct count of creator_id from projects with an active Jira Cloud
   DVCS integration.
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integration
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
index 49747d3239c..4d34d7917d5 100644
--- a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.plan.projects_jira_dvcs_server_active
 description: Distinct count of creator_id from projects with an active Jira Server
   DVCS integration.
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integration
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
index c38fc0bd081..4facf658e6a 100644
--- a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
+++ b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.jira_imports_total_imported_count
 description: Count of Jira imports completed
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: jira_importer
 value_type: number
diff --git a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
index 0188ba1510b..fb5a674aff9 100644
--- a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
+++ b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.jira_imports_projects_count
 description: Count of Projects that imported Issues from Jira
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: jira_importer
 value_type: number
diff --git a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
index c67c7daa770..6d4265d9ac7 100644
--- a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
+++ b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
@@ -4,7 +4,7 @@ key_path: counts.jira_imports_total_imported_issues_count
 instrumentation_class: JiraImportsTotalImportedIssuesCountMetric
 description: Count of total issues imported via the Jira Importer
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: jira_importer
 value_type: number
diff --git a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
index 90be5ffdc55..3d057ff95bc 100644
--- a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_datadog_active
 description: Count of projects with active integrations for Datadog
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
index a3a52c46c32..be03cd7e5e2 100644
--- a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_datadog_active
 description: Count of groups with active integrations for Datadog
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
index 9046087dbdc..4fba91477b6 100644
--- a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_datadog_active
 description: Count of active service templates for Datadog
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
index 396e3f19253..f5d70fb8260 100644
--- a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_datadog_active
 description: Count of active instance-level integrations for Datadog
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
index 50b1f471188..0bd995daf6f 100644
--- a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_datadog_active
 description: Count of active projects inheriting integrations for Datadog
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
index 039c71f6b32..09bcd9912f6 100644
--- a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_datadog_active
 description: Count of active groups inheriting integrations for Datadog
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
index 2a906265e76..772ef421072 100644
--- a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_ewm_active
 description: Count of projects with active integrations for EWM
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
index f2de8af7f77..07366301514 100644
--- a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_ewm_active
 description: Count of groups with active integrations for EWM
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
index de408750880..0e11cba9c6e 100644
--- a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_ewm_active
 description: Count of active service templates for EWM
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
index 3cf2648b6ba..5e07ff74113 100644
--- a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_ewm_active
 description: Count of active instance-level integrations for EWM
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
index 5c7b7c23d20..4704daf9813 100644
--- a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_ewm_active
 description: Count of active projects inheriting integrations for EWM
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
index c385ba3eccc..e5c80d2c1d1 100644
--- a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_ewm_active
 description: Count of active groups inheriting integrations for EWM
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
index a3d554185c3..cd958106cbc 100644
--- a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_mock_ci_active
 description: Count of projects with active integrations for Mock CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
index 0f00e04dbf9..0db2c32ba7a 100644
--- a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_mock_ci_active
 description: Count of groups with active integrations for Mock CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
index 4cff208fc0e..279fd3cc10d 100644
--- a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_mock_ci_active
 description: Count of active service templates for Mock CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
index 90878f664ca..15347e16178 100644
--- a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_mock_ci_active
 description: Count of active instance-level integrations for  Mock CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
index 0e7cee64e47..6b1a9ed0089 100644
--- a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_mock_ci_active
 description: Count of active projects inheriting integrations for Mock CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
index 4bd419796cd..314e0e23397 100644
--- a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_mock_ci_active
 description: Count of active groups inheriting integrations for Mock CI
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
index b44a007dd38..df1a5def60d 100644
--- a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_mock_monitoring_active
 description: Count of projects with active integrations for Mock Monitoring
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
index c7d70b6fb98..1e891cd7307 100644
--- a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_mock_monitoring_active
 description: Count of groups with active integrations for Mock Monitoring
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
index 7971b785633..4254f5ffd44 100644
--- a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_mock_monitoring_active
 description: Count of active service templates for Mock Monitoring
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
index b5949125a90..e2504a98c71 100644
--- a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_mock_monitoring_active
 description: Count of active instance-level integrations for  Mock Monitoring
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
index 9cd2d8c098a..6a39fcb9fa1 100644
--- a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_mock_monitoring_active
 description: Count of active projects inheriting integrations for Mock Monitoring
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
index 681ee727cd6..7a3fe6993d8 100644
--- a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_mock_monitoring_active
 description: Count of active groups inheriting integrations for Mock Monitoring
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
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 45dcd531484..1ad33d0d479 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
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: counts.package_events_i_package_pull_package_by_guest
 description: A count of packages that have been downloaded from the package registry
   by a guest
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 252474155c1..051e99a67e4 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
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: counts.package_events_i_package_push_package_by_deploy_token
 description: A count of packages that have been published to the package registry
   using a deploy token
diff --git a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
index 1ce9be56198..b8362fb9d71 100644
--- a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
+++ b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailSentMetric
+options:
+  track: create
+  series: 0
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
index 98ed67d0910..b93fe4f735e 100644
--- a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailCtaClickedMetric
+options:
+  track: create
+  series: 0
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
index 67177bce5dd..b6b3fbb3c49 100644
--- a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
+++ b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailSentMetric
+options:
+  track: create
+  series: 1
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
index c5c057fce25..4c457b33db3 100644
--- a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailCtaClickedMetric
+options:
+  track: create
+  series: 1
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
index c25864475c4..b0611253f8f 100644
--- a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
+++ b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailSentMetric
+options:
+  track: create
+  series: 2
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
index 37ec35d95ba..150e8ba7f3a 100644
--- a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailCtaClickedMetric
+options:
+  track: create
+  series: 2
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
index 59e3aff567d..d52c4b0066c 100644
--- a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
+++ b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailSentMetric
+options:
+  track: verify
+  series: 0
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
index 17ca0252a0c..6deabd1edda 100644
--- a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailCtaClickedMetric
+options:
+  track: verify
+  series: 0
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
index dfd8bb11919..6d0d53c94d4 100644
--- a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
+++ b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailSentMetric
+options:
+  track: verify
+  series: 1
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
index 6c76386456a..dd412d2cb96 100644
--- a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailCtaClickedMetric
+options:
+  track: verify
+  series: 1
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
index 8cc755cc5bf..f076b40f403 100644
--- a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
+++ b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailSentMetric
+options:
+  track: verify
+  series: 2
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
index 61940a9e0cb..1eea75bb65f 100644
--- a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailCtaClickedMetric
+options:
+  track: verify
+  series: 2
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
index cc2a9c29f1f..216997d9710 100644
--- a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
+++ b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailSentMetric
+options:
+  track: trial
+  series: 0
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
index 3b4a1f7a88e..4a8cbd28827 100644
--- a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailCtaClickedMetric
+options:
+  track: trial
+  series: 0
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
index dd7487b6609..faaf52e4edd 100644
--- a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
+++ b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailSentMetric
+options:
+  track: trial
+  series: 1
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
index 0dd150778fe..87b8a1322d5 100644
--- a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailCtaClickedMetric
+options:
+  track: trial
+  series: 1
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
index 66610ba34f5..0a1c9d7018e 100644
--- a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
+++ b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailSentMetric
+options:
+  track: trial
+  series: 2
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
index e630c81f53c..10d03b730d0 100644
--- a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailCtaClickedMetric
+options:
+  track: trial
+  series: 2
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
index b8febff5fcd..572547424c7 100644
--- a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
+++ b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailSentMetric
+options:
+  track: team
+  series: 0
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
index d90a0f9dbde..aeaced8c4f2 100644
--- a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailCtaClickedMetric
+options:
+  track: team
+  series: 0
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
index 84f7d7d28af..3e8fead4c32 100644
--- a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
+++ b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailSentMetric
+options:
+  track: team
+  series: 1
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
index 1abe86f5a89..8445229f781 100644
--- a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailCtaClickedMetric
+options:
+  track: team
+  series: 1
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
index ba1530445e8..d8f4beb30c1 100644
--- a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
+++ b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailSentMetric
+options:
+  track: team
+  series: 2
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
index f9b473aec6c..b6ff4c4ad85 100644
--- a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
@@ -13,6 +13,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailCtaClickedMetric
+options:
+  track: team
+  series: 2
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml b/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
index 94b3340d1ca..4c8659e9f95 100644
--- a/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
@@ -12,6 +12,10 @@ milestone: "14.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66854
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailCtaClickedMetric
+options:
+  track: team_short
+  series: 0
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml b/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
index dbcd4faf26f..9f18e78c443 100644
--- a/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
+++ b/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
@@ -12,6 +12,10 @@ milestone: "14.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66854
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailSentMetric
+options:
+  track: team_short
+  series: 0
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml b/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
index a23c977240a..57f1fcc6694 100644
--- a/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
@@ -12,6 +12,10 @@ milestone: "14.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66943
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailCtaClickedMetric
+options:
+  track: trial_short
+  series: 0
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml b/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
index c24e2f4b6b5..dc18b08081f 100644
--- a/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
+++ b/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
@@ -12,6 +12,10 @@ milestone: "14.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66943
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailSentMetric
+options:
+  track: trial_short
+  series: 0
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
index 2a62f9a572f..a991d9362d1 100644
--- a/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
@@ -12,6 +12,10 @@ milestone: "14.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67147
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailCtaClickedMetric
+options:
+  track: admin_verify
+  series: 0
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml b/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
index b04c9502a12..0ecf55cc5fc 100644
--- a/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
+++ b/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
@@ -12,6 +12,10 @@ milestone: "14.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67147
 time_frame: all
 data_source: database
+instrumentation_class: InProductMarketingEmailSentMetric
+options:
+  track: admin_verify
+  series: 0
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_all/20210730011801_projects_zentao_active.yml b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
index 857e96901a1..2071f97b37e 100644
--- a/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
@@ -3,7 +3,7 @@ key_path: counts.projects_zentao_active
 name: count_all_projects_zentao_active
 description: Count of projects with active Zentao integrations
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210730011802_groups_zentao_active.yml b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
index d0b023c241e..5708b9f678e 100644
--- a/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_zentao_active
 name: count_all_groups_zentao_active
 description: Count of groups with active Zentao integrations
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210730011804_instances_zentao_active.yml b/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
index 89532a91d52..1fed38ede89 100644
--- a/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
@@ -3,7 +3,7 @@ key_path: counts.instances_zentao_active
 name: count_all_instances_zentao_active
 description: Count of instances with active Zentao integrations
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml b/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
index 054714f5c42..81408dc5e1c 100644
--- a/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
@@ -3,7 +3,7 @@ key_path: counts.projects_inheriting_zentao_active
 name: count_all_projects_inheriting_zentao_active
 description: Count of projects that inherit active Zentao integrations
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml b/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
index ce6797e5114..55fcd877e8c 100644
--- a/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_inheriting_zentao_active
 name: count_all_groups_inheriting_zentao_active
 description: Count of groups that inherit active Zentao integrations
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
index 5c3fc71f564..b8b238e28fe 100644
--- a/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_gitlab_slack_application_active
 name: count_groups_gitlab_slack_application_active
 description: Count groups with active slack application
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml
index a3fac680dbf..7e696485c9b 100644
--- a/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml
@@ -3,7 +3,7 @@ key_path: counts.projects_gitlab_slack_application_active
 name: count_project_gitlab_slack_application_active
 description: Count projects with active slack application
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml
index a4908a2a8e1..3730c21bd59 100644
--- a/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml
@@ -3,7 +3,7 @@ key_path: counts.instances_gitlab_slack_application_active
 name: count_instances_gitlab_slack_application_active
 description: Count instances with active slack application
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml
index f5d10688fec..904cf384072 100644
--- a/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_inheriting_gitlab_slack_application_active
 name: count_groups_inheriting_gitlab_slack_application_active
 description: Count groups inheriting active slack application
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
index 17bb5b34247..5b4843c2fd0 100644
--- a/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
@@ -3,7 +3,7 @@ key_path: counts.projects_inheriting_gitlab_slack_application_active
 name: count_project_inheriting_gitlab_slack_application_active
 description: Count projects inheriting active slack application
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20211028210001_projects_shimo_active.yml b/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
index 3d7f04a9f82..9256e3114e7 100644
--- a/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
@@ -3,7 +3,7 @@ key_path: counts.projects_shimo_active
 name: count_all_projects_shimo_active
 description: Count of projects with active Shimo integrations
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
index 641d40aa1fd..215c300a418 100644
--- a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_shimo_active
 name: count_all_groups_shimo_active
 description: Count of groups with active Shimo integrations
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20211028210003_instances_shimo_active.yml b/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
index e9b77835ca4..f2d18212671 100644
--- a/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
@@ -3,7 +3,7 @@ key_path: counts.instances_shimo_active
 name: count_all_instances_shimo_active
 description: Count of instances with active Shimo integrations
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
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 7693de6b2f2..cb433b10c0e 100644
--- a/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
@@ -3,7 +3,7 @@ key_path: counts.projects_inheriting_shimo_active
 name: count_all_projects_inheriting_shimo_active
 description: Count of projects that inherit active Shimo integrations
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
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 b81747fee78..0dc13607603 100644
--- a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_inheriting_shimo_active
 name: count_all_groups_inheriting_shimo_active
 description: Count of groups that inherit active Shimo integrations
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20220315180122_projects_harbor_active.yml b/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
index ff28b7df17f..7e84ebefc86 100644
--- a/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_harbor_active
 description: Count of projects with active integrations for Harbor
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20220315180124_groups_harbor_active.yml b/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
index 79614c925d1..344a07e006d 100644
--- a/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_harbor_active
 description: Count of groups with active integrations for Harbor
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20220315180127_instances_harbor_active.yml b/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
index b865a905c0b..d6f76a1c31a 100644
--- a/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_harbor_active
 description: Count of active instance-level integrations for Harbor
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml b/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
index 375f3b9a0b3..d3c6e214eb8 100644
--- a/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_harbor_active
 description: Count of active projects inheriting integrations for Harbor
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml b/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
index 6e216121414..c61c58da4c9 100644
--- a/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_harbor_active
 description: Count of active groups inheriting integrations for Harbor
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml b/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml
index 960f859b07f..07a630424df 100644
--- a/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_pumble_active
 description: Count of active groups inheriting integrations for Pumble
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20220802141715_groups_pumble_active.yml b/config/metrics/counts_all/20220802141715_groups_pumble_active.yml
index 3a62a002f10..2d79df7b275 100644
--- a/config/metrics/counts_all/20220802141715_groups_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_groups_pumble_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_pumble_active
 description: Count of groups with active integrations for Pumble
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20220802141715_instances_pumble_active.yml b/config/metrics/counts_all/20220802141715_instances_pumble_active.yml
index d313ee39b31..457e6d7e861 100644
--- a/config/metrics/counts_all/20220802141715_instances_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_instances_pumble_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_pumble_active
 description: Count of active instance-level integrations for Pumble
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml b/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml
index ae928de6140..560593744d1 100644
--- a/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_pumble_active
 description: Count of active projects inheriting integrations for Pumble
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20220802141715_projects_pumble_active.yml b/config/metrics/counts_all/20220802141715_projects_pumble_active.yml
index 5f352a1cae4..182a76e98f8 100644
--- a/config/metrics/counts_all/20220802141715_projects_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_projects_pumble_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_pumble_active
 description: Count of projects with active integrations for Pumble
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20220906074055_package_events_i_package_rpm_pull_package.yml b/config/metrics/counts_all/20220906074055_package_events_i_package_rpm_pull_package.yml
new file mode 100644
index 00000000000..e45b9092147
--- /dev/null
+++ b/config/metrics/counts_all/20220906074055_package_events_i_package_rpm_pull_package.yml
@@ -0,0 +1,25 @@
+---
+data_category: optional
+key_path: counts.package_events_i_package_rpm_pull_package
+description: A count of RPM packages that have been downloaded
+product_section: ops
+product_stage: package
+product_group: package
+product_category: package_registry
+value_type: number
+status: active
+milestone: '15.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97133
+time_frame: all
+data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: package_events
+  event: i_package_rpm_pull_package
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20220906074525_package_events_i_package_rpm_push_package.yml b/config/metrics/counts_all/20220906074525_package_events_i_package_rpm_push_package.yml
new file mode 100644
index 00000000000..f41f98d5052
--- /dev/null
+++ b/config/metrics/counts_all/20220906074525_package_events_i_package_rpm_push_package.yml
@@ -0,0 +1,25 @@
+---
+data_category: optional
+key_path: counts.package_events_i_package_rpm_push_package
+description: A count of RPM packages that have been published
+product_section: ops
+product_stage: package
+product_group: package
+product_category: package_registry
+value_type: number
+status: active
+milestone: '15.6'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97133
+time_frame: all
+data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: package_events
+  event: i_package_rpm_push_package
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml b/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
index a538e097254..a89ceecbe0e 100644
--- a/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
+++ b/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
@@ -2,7 +2,7 @@
 key_path: counts.gitlab_for_jira_app_direct_installations
 description: Count active Jira Cloud direct installations
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml b/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml
index fcab9fd1794..6b05ad8c250 100644
--- a/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml
+++ b/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml
@@ -2,7 +2,7 @@
 key_path: counts.gitlab_for_jira_app_proxy_installations
 description: Count active Jira Cloud installations that are using GitLab as a proxy
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
index c269fe6edd4..fb4608c12c5 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: mattermost_enabled
 description: Whether Mattermost is enabled
 product_section: dev
-product_stage: ecosystem
+product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: boolean
diff --git a/config/metrics/settings/20221015152126_deactivate_dormant_users_enabled.yml b/config/metrics/settings/20221015152126_deactivate_dormant_users_enabled.yml
new file mode 100644
index 00000000000..0f77cde4014
--- /dev/null
+++ b/config/metrics/settings/20221015152126_deactivate_dormant_users_enabled.yml
@@ -0,0 +1,23 @@
+---
+key_path: deactivate_dormant_users_enabled
+description: Whether Dormant User Deactivation is enabled
+product_section: fulfillment
+product_stage: fulfillment
+product_group: utilization
+product_category: subscription_cost_management
+value_type: boolean
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101125
+time_frame: none
+data_source: database
+data_category: optional
+instrumentation_class: DormantUserSettingEnabledMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/settings/20221015161233_deactivate_dormant_users_period.yml b/config/metrics/settings/20221015161233_deactivate_dormant_users_period.yml
new file mode 100644
index 00000000000..6cd7e0f0da7
--- /dev/null
+++ b/config/metrics/settings/20221015161233_deactivate_dormant_users_period.yml
@@ -0,0 +1,23 @@
+---
+key_path: deactivate_dormant_users_period
+description: The value of the dormant users period being used
+product_section: fulfillment
+product_stage: fulfillment
+product_group: utilization
+product_category: subscription_cost_management
+value_type: boolean
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101125
+time_frame: none
+data_source: database
+data_category: optional
+instrumentation_class: DormantUserPeriodSettingMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/open_api.yml b/config/open_api.yml
index 8415a6bff3d..6e767f51ef8 100644
--- a/config/open_api.yml
+++ b/config/open_api.yml
@@ -14,5 +14,98 @@ metadata:
       name: private_token
       in: query
   tags:
+    # Keep in alphabetical order
+  - name: access_requests
+    description: Operations related to access requests
+  - name: ci_lint
+    description: Operations related to linting a CI config file
+  - name: ci_resource_groups
+    description: Operations to manage job concurrency with resource groups
+  - name: ci_variables
+    description: Operations related to CI/CD variables
+  - name: cluster_agents
+    description: Operations related to the GitLab agent for Kubernetes
+  - name: clusters
+    description: Operations related to clusters
+  - name: container_registry
+    description: Operations related to container registry
+  - name: dashboard_annotations
+    description: Operations related to dashboard annotations
+  - name: dependency_proxy
+    description: Operations to manage dependency proxy for a groups
+  - name: deploy_keys
+    description: Operations related to deploy keys
+  - name: deploy_tokens
+    description: Operations related to deploy tokens
+  - name: deployments
+    description: Operations related to deployments
+  - name: dora_metrics
+    description: Operations related to DevOps Research and Assessment (DORA) key metrics
+  - name: environments
+    description: Operations related to environments
+  - name: error_tracking_client_keys
+    description: Operations related to error tracking client keys
+  - name: error_tracking_project_settings
+    description: Operations related to error tracking project settings
+  - name: feature_flags_user_lists
+    description: Operations related to accessing GitLab feature flag user lists
+  - name: feature_flags
+    description: Operations related to feature flags
+  - name: features
+    description: Operations related to managing Flipper-based feature flags
+  - name: freeze_periods
+    description: Operations related to deploy freeze periods
+  - name: geo
+    description: Operations related to Geo
+  - name: geo_nodes
+    description: Operations related Geo Nodes
+  - name: go_proxy
+    description: Operations related to Go Proxy
+  - name: group_export
+    description: Operations related to exporting groups
+  - name: group_import
+    description: Operations related to importing groups
+  - name: group_packages
+    description: Operations related to group packages
+  - name: integrations
+    description: Operations related to integrations
+  - name: issue_links
+    description: Operations related to issue links
+  - name: merge_requests
+    description: Operations related to merge requests
   - name: metadata
     description: Operations related to metadata of the GitLab instance
+  - name: metrics_user_starred_dashboards
+    description: Operations related to User-starred metrics dashboards
+  - name: package_files
+    description: Operations about package files
+  - name: plan_limits
+    description: Operations related to plan limits
+  - name: project_export
+    description: Operations related to exporting projects
+  - name: project_hooks
+    description: Operations related to project hooks
+  - name: project_import
+    description: Operations related to importing projects
+  - name: project_import_bitbucket
+    description: Operations related to importing BitBucket projects
+  - name: project_import_github
+    description: Operations related to importing GitHub projects
+  - name: protected environments
+    description: Operations related to protected environments
+  - name: release_links
+    description: Operations related to release assets (links)
+  - name: releases
+    description: Operations related to releases
+  - name: resource_milestone_events
+    description: Operations about resource milestone events
+  - name: suggestions
+    description: Operations related to suggestions
+  - name: system_hooks
+    description: Operations related to system hooks
+  - name: terraform_state
+    description: Operations related to Terraform state files
+  - name: terraform_registry
+    description: Operations related to the Terraform module registry
+  - name: unleash_api
+    description: Operations related to Unleash API
diff --git a/config/puma.example.development.rb b/config/puma.example.development.rb
index 3164ffe3ef4..71a4e9b36f1 100644
--- a/config/puma.example.development.rb
+++ b/config/puma.example.development.rb
@@ -67,6 +67,11 @@ on_worker_boot do
   Gitlab::Cluster::LifecycleEvents.do_worker_start
 end
 
+on_worker_shutdown do
+  # Signal application hooks that a worker is shutting down
+  Gitlab::Cluster::LifecycleEvents.do_worker_stop
+end
+
 # Preload the application before starting the workers; this conflicts with
 # phased restart feature. (off by default)
 
diff --git a/config/puma.rb.example b/config/puma.rb.example
index c70baf6570e..59844b4aecf 100644
--- a/config/puma.rb.example
+++ b/config/puma.rb.example
@@ -57,6 +57,11 @@ on_worker_boot do
   Gitlab::Cluster::LifecycleEvents.do_worker_start
 end
 
+on_worker_shutdown do
+  # Signal application hooks that a worker is shutting down
+  Gitlab::Cluster::LifecycleEvents.do_worker_stop
+end
+
 # Preload the application before starting the workers; this conflicts with
 # phased restart feature. (off by default)
 preload_app!
diff --git a/config/routes.rb b/config/routes.rb
index 6cfbb969acb..27313854233 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,7 +2,6 @@
 
 require 'sidekiq/web'
 require 'sidekiq/cron/web'
-require 'product_analytics/collector_app'
 
 InitializerConnections.with_disabled_database_connections do
   Rails.application.routes.draw do
@@ -56,7 +55,9 @@ InitializerConnections.with_disabled_database_connections do
     match '/oauth/token' => 'oauth/tokens#create', via: :options
     match '/oauth/revoke' => 'oauth/tokens#revoke', via: :options
 
-    match '/-/jira_connect/oauth_application_id' => 'jira_connect/oauth_application_ids#show', via: :options
+    match '/-/jira_connect/oauth_application_id' => 'jira_connect/cors_preflight_checks#index', via: :options
+    match '/-/jira_connect/subscriptions/:id' => 'jira_connect/cors_preflight_checks#index', via: :options
+    match '/-/jira_connect/installations' => 'jira_connect/cors_preflight_checks#index', via: :options
 
     # Sign up
     scope path: '/users/sign_up', module: :registrations, as: :users_sign_up do
@@ -217,9 +218,6 @@ InitializerConnections.with_disabled_database_connections do
       # Deprecated route for permanent failures
       # https://gitlab.com/gitlab-org/gitlab/-/issues/362606
       post '/members/mailgun/permanent_failures' => 'mailgun/webhooks#process_webhook'
-
-      # Product analytics collector
-      match '/collector/i', to: ProductAnalytics::CollectorApp.new, via: :all
     end
     # End of the /-/ scope.
 
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 4a47b349665..a715596580d 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -121,7 +121,11 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
     resource :dependency_proxy, only: [:show, :update]
     resources :email_campaigns, only: :index
 
-    resources :observability, only: :index
+    namespace :observability do
+      get 'dashboards'
+      get 'explore'
+      get 'manage'
+    end
 
     namespace :harbor do
       resources :repositories, only: [:index, :show], constraints: { id: %r{[a-zA-Z./:0-9_\-]+} } do
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 0b0d370223c..5a85a029607 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -142,7 +142,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
             end
           end
 
-          resource :repository, only: [:show], controller: :repository do
+          resource :repository, only: [:show, :update], controller: :repository do
             # TODO: Removed this "create_deploy_token" route after change was made in app/helpers/ci_variables_helper.rb:14
             # See MR comment for more detail: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27059#note_311585356
             post :create_deploy_token, path: 'deploy_token/create'
@@ -353,7 +353,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         end
 
         resources :alert_management, only: [:index] do
-          get 'details', on: :member
+          member do
+            get 'details(/*page)', to: 'alert_management#details', as: 'details'
+          end
         end
 
         get 'alert_management/:id', to: 'alert_management#details', as: 'alert_management_alert'
@@ -379,14 +381,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           resources :projects, only: :index
         end
 
-        resources :product_analytics, only: [:index] do
-          collection do
-            get :setup
-            get :test
-            get :graphs
-          end
-        end
-
         resources :error_tracking, only: [:index], controller: :error_tracking do
           collection do
             get ':issue_id/details',
@@ -478,6 +472,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
             end
           end
         end
+
+        namespace :ml do
+          resources :experiments, only: [:index, :show], controller: 'experiments'
+        end
       end
       # End of the /-/ scope.
 
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index eff83e3f3c4..4ed4dca8912 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -109,6 +109,8 @@
   - 1
 - - container_repository
   - 1
+- - container_repository_delete
+  - 1
 - - create_commit_signature
   - 2
 - - create_github_webhook
@@ -257,6 +259,8 @@
   - 1
 - - integrations_slack_event
   - 1
+- - integrations_slack_interactivity
+  - 1
 - - invalid_gpg_signature_update
   - 2
 - - issuable_export_csv
@@ -297,6 +301,8 @@
   - 1
 - - merge_requests_create_approval_note
   - 1
+- - merge_requests_delete_branch
+  - 1
 - - merge_requests_delete_source_branch
   - 1
 - - merge_requests_execute_approval_hooks