Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

587 files changed, 3951 insertions, 2497 deletions

diff --git a/config/application.rb b/config/application.rb
index b9792cba793..dddd4ecac5e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -36,8 +36,6 @@ module Gitlab
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    config.active_record.sqlite3.represent_boolean_as_integer = true
-
     # Sidekiq uses eager loading, but directories not in the standard Rails
     # directories must be added to the eager load paths:
     # https://github.com/mperham/sidekiq/wiki/FAQ#why-doesnt-sidekiq-autoload-my-rails-application-code
@@ -49,6 +47,7 @@ module Gitlab
     config.eager_load_paths.push(*%W[#{config.root}/lib
                                      #{config.root}/app/models/badges
                                      #{config.root}/app/models/hooks
+                                     #{config.root}/app/models/integrations
                                      #{config.root}/app/models/members
                                      #{config.root}/app/models/project_services
                                      #{config.root}/app/graphql/resolvers/concerns
@@ -57,8 +56,9 @@ module Gitlab
 
     config.generators.templates.push("#{config.root}/generator_templates")
 
+    foss_eager_load_paths = config.eager_load_paths.dup.freeze
     load_paths = lambda do |dir:|
-      ext_paths = config.eager_load_paths.each_with_object([]) do |path, memo|
+      ext_paths = foss_eager_load_paths.each_with_object([]) do |path, memo|
         ext_path = config.root.join(dir, Pathname.new(path).relative_path_from(config.root))
         memo << ext_path.to_s
       end
@@ -85,6 +85,7 @@ module Gitlab
     # Rake tasks ignore the eager loading settings, so we need to set the
     # autoload paths explicitly
     config.autoload_paths = config.eager_load_paths.dup
+    config.autoload_paths.push("#{config.root}/lib/generators")
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
@@ -146,6 +147,7 @@ module Gitlab
       encrypted_key
       import_url
       elasticsearch_url
+      elasticsearch_password
       search
       jwt
       otp_attempt
@@ -209,6 +211,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/merge_conflicts.css"
     config.assets.precompile << "page_bundles/merge_requests.css"
     config.assets.precompile << "page_bundles/milestone.css"
+    config.assets.precompile << "page_bundles/new_namespace.css"
     config.assets.precompile << "page_bundles/oncall_schedules.css"
     config.assets.precompile << "page_bundles/pipeline.css"
     config.assets.precompile << "page_bundles/pipeline_schedules.css"
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 2c6ab3bbc79..9fa8a1b762c 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -23,6 +23,9 @@ Rails.application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance
   config.assets.compile = false if ENV['CI']
+  # There is no need to check if assets are precompiled locally
+  # To debug AssetNotPrecompiled errors locally, set CHECK_PRECOMPILED_ASSETS to true
+  config.assets.check_precompiled_asset = Gitlab::Utils.to_boolean(ENV['CHECK_PRECOMPILED_ASSETS'], default: false)
 
   config.public_file_server.enabled = true
   config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
diff --git a/config/events/schema.json b/config/events/schema.json
new file mode 100644
index 00000000000..3a0616e706b
--- /dev/null
+++ b/config/events/schema.json
@@ -0,0 +1,70 @@
+{
+  "type": "object",
+  "required": [],
+  "properties": {
+    "description": {
+      "type": "string"
+    },
+    "category": {
+      "type": "string"
+    },
+    "action": {
+      "type": "string"
+    },
+    "label_description": {
+      "type": ["string", "null"]
+    },
+    "property_description": {
+      "type": ["string", "null"]
+    },
+    "value_description": {
+      "type": ["string", "null"]
+    },
+    "extra_properties": {
+      "type": ["object", "null"]
+    },
+    "identifiers": {
+      "type": ["array", "null"],
+      "items": {
+        "type": "string",
+        "enum": ["project", "user", "namespace"]
+      }
+    },
+    "iglu_schema_url": {
+      "type": ["string", "null"]
+    },
+    "product_section": {
+      "type": "string"
+    },
+    "product_stage": {
+      "type": ["string", "null"]
+    },
+    "product_group": {
+      "type": "string"
+    },
+    "product_category": {
+      "type": ["string", "null"]
+    },
+    "introduced_by_url": {
+      "type": ["uri", "null"]
+    },
+    "milestone": {
+      "type": ["string", "null"],
+      "pattern": "^[0-9]+\\.[0-9]+$"
+    },
+    "distributions": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "enum": ["ee", "ce"]
+      }
+    },
+    "tiers": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "enum": ["free", "premium", "ultimate"]
+      }
+    }
+  }
+}
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index 915c40fdbbc..2c2922d6fae 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -33,6 +33,7 @@
 - container_scanning
 - continuous_delivery
 - continuous_integration
+- continuous_integration_scaling
 - database
 - dataops
 - dependency_firewall
@@ -45,7 +46,10 @@
 - editor_extension
 - epics
 - error_tracking
-- experimentation
+- experimentation_activation
+- experimentation_adoption
+- experimentation_conversion
+- experimentation_expansion
 - feature_flags
 - five_minute_production_app
 - foundations
diff --git a/config/feature_flags/development/api_caching_branches.yml b/config/feature_flags/development/api_caching_branches.yml
new file mode 100644
index 00000000000..310d643529e
--- /dev/null
+++ b/config/feature_flags/development/api_caching_branches.yml
@@ -0,0 +1,8 @@
+---
+name: api_caching_branches
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61157
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330371
+milestone: '13.12'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/api_caching_merge_requests.yml b/config/feature_flags/development/api_caching_merge_requests.yml
new file mode 100644
index 00000000000..53e170a6847
--- /dev/null
+++ b/config/feature_flags/development/api_caching_merge_requests.yml
@@ -0,0 +1,8 @@
+---
+name: api_caching_merge_requests
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61067
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330342
+milestone: '13.12'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/workhorse_extract_filename_base.yml b/config/feature_flags/development/api_caching_rate_limit_branches.yml
index a80f6c45f28..a48e4660342 100644
--- a/config/feature_flags/development/workhorse_extract_filename_base.yml
+++ b/config/feature_flags/development/api_caching_rate_limit_branches.yml
@@ -1,8 +1,8 @@
 ---
-name: workhorse_extract_filename_base
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57889
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326379
-milestone: '13.11'
+name: api_caching_rate_limit_branches
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61688
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330876
+milestone: '13.12'
 type: development
 group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/invite_your_teammates_banner_a.yml b/config/feature_flags/development/assigned_open_issues_cache.yml
index c7b16357c68..6075407c6ce 100644
--- a/config/feature_flags/development/invite_your_teammates_banner_a.yml
+++ b/config/feature_flags/development/assigned_open_issues_cache.yml
@@ -1,8 +1,7 @@
 ---
-name: invite_your_teammates_banner_a
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37658
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/231275
-milestone: '13.4'
+name: assigned_open_issues_cache
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59961
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325470
+group: group::product planning
 type: development
-group: group::expansion
 default_enabled: false
diff --git a/config/feature_flags/development/auto_create_cluster_management_project.yml b/config/feature_flags/development/auto_create_cluster_management_project.yml
deleted file mode 100644
index ea7bf349e1e..00000000000
--- a/config/feature_flags/development/auto_create_cluster_management_project.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: auto_create_cluster_management_project
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23946
-rollout_issue_url: 
-milestone: '12.10'
-type: development
-group: group::configure
-default_enabled: false
diff --git a/config/feature_flags/development/ci_accept_frontend_prometheus_metrics.yml b/config/feature_flags/development/background_pipeline_retry_endpoint.yml
index b795b2505d8..57f90d01e2c 100644
--- a/config/feature_flags/development/ci_accept_frontend_prometheus_metrics.yml
+++ b/config/feature_flags/development/background_pipeline_retry_endpoint.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_accept_frontend_prometheus_metrics
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52820
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300770
-milestone: '13.9'
+name: background_pipeline_retry_endpoint
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61270
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330915
+milestone: '13.12'
 type: development
 group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/ban_user_feature_flag.yml b/config/feature_flags/development/ban_user_feature_flag.yml
new file mode 100644
index 00000000000..6765e82e252
--- /dev/null
+++ b/config/feature_flags/development/ban_user_feature_flag.yml
@@ -0,0 +1,8 @@
+---
+name: ban_user_feature_flag
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61292
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330667
+milestone: '13.12'
+type: development
+group: group::access
+default_enabled: false
diff --git a/config/feature_flags/development/cache_home_panel.yml b/config/feature_flags/development/cache_home_panel.yml
new file mode 100644
index 00000000000..63798cd31d0
--- /dev/null
+++ b/config/feature_flags/development/cache_home_panel.yml
@@ -0,0 +1,8 @@
+---
+name: cache_home_panel
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57031
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328421
+milestone: '13.12'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/cached_commits.yml b/config/feature_flags/development/cached_commits.yml
new file mode 100644
index 00000000000..0758f8a3f53
--- /dev/null
+++ b/config/feature_flags/development/cached_commits.yml
@@ -0,0 +1,8 @@
+---
+name: cached_commits
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61617
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330968
+milestone: '13.12'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/cached_encoding_detection.yml b/config/feature_flags/development/cached_encoding_detection.yml
new file mode 100644
index 00000000000..362c465cfb6
--- /dev/null
+++ b/config/feature_flags/development/cached_encoding_detection.yml
@@ -0,0 +1,8 @@
+---
+name: cached_encoding_detection
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60128
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328819
+milestone: '13.12'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/cached_loading_hints.yml b/config/feature_flags/development/cached_loading_hints.yml
new file mode 100644
index 00000000000..ba4eaece55a
--- /dev/null
+++ b/config/feature_flags/development/cached_loading_hints.yml
@@ -0,0 +1,8 @@
+---
+name: cached_loading_hints
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61609
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330802
+milestone: '13.12'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/cached_mr_title.yml b/config/feature_flags/development/cached_mr_title.yml
new file mode 100644
index 00000000000..0284663f441
--- /dev/null
+++ b/config/feature_flags/development/cached_mr_title.yml
@@ -0,0 +1,8 @@
+---
+name: cached_mr_title
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61605
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330907
+milestone: '13.12'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/check_maven_path_first.yml b/config/feature_flags/development/check_maven_path_first.yml
index b871bf8902d..85c303dc766 100644
--- a/config/feature_flags/development/check_maven_path_first.yml
+++ b/config/feature_flags/development/check_maven_path_first.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327487
 milestone: '13.11'
 type: development
 group: group::package
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_drop_cyclical_triggered_pipelines.yml b/config/feature_flags/development/ci_drop_cyclical_triggered_pipelines.yml
new file mode 100644
index 00000000000..6a08d4aa72c
--- /dev/null
+++ b/config/feature_flags/development/ci_drop_cyclical_triggered_pipelines.yml
@@ -0,0 +1,8 @@
+---
+name: ci_drop_cyclical_triggered_pipelines
+introduced_by_url: https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/1195
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329390
+milestone: '13.12'
+type: development
+group: group::continuous integration
+default_enabled: true
diff --git a/config/feature_flags/development/ci_fix_pipeline_status_for_dag_needs_manual.yml b/config/feature_flags/development/ci_fix_pipeline_status_for_dag_needs_manual.yml
index 1c30d8a14e2..ac8b7a5300e 100644
--- a/config/feature_flags/development/ci_fix_pipeline_status_for_dag_needs_manual.yml
+++ b/config/feature_flags/development/ci_fix_pipeline_status_for_dag_needs_manual.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321972
 milestone: '13.10'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_job_token_scope.yml b/config/feature_flags/development/ci_job_token_scope.yml
new file mode 100644
index 00000000000..464fc77a69e
--- /dev/null
+++ b/config/feature_flags/development/ci_job_token_scope.yml
@@ -0,0 +1,8 @@
+---
+name: ci_job_token_scope
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49750
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300821
+milestone: '13.12'
+type: development
+group: group::package
+default_enabled: false
diff --git a/config/feature_flags/development/gldropdown_tags.yml b/config/feature_flags/development/ci_minutes_track_live_consumption.yml
index 704f276ac37..ddd21f3909e 100644
--- a/config/feature_flags/development/gldropdown_tags.yml
+++ b/config/feature_flags/development/ci_minutes_track_live_consumption.yml
@@ -1,8 +1,8 @@
 ---
-name: gldropdown_tags
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58589
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327055
-milestone: '13.11'
+name: ci_minutes_track_live_consumption
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59263
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329197
+milestone: '13.12'
 type: development
 group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/ci_config_merged_tab.yml b/config/feature_flags/development/ci_modified_paths_of_external_prs.yml
index 8ccdf105951..70d5e0ce076 100644
--- a/config/feature_flags/development/ci_config_merged_tab.yml
+++ b/config/feature_flags/development/ci_modified_paths_of_external_prs.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_config_merged_tab
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53299
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/301103
-milestone: '13.9'
+name: ci_modified_paths_of_external_prs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60736
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330605
+milestone: '13.12'
 type: development
 group: group::pipeline authoring
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/vueify_shared_runners_toggle.yml b/config/feature_flags/development/ci_require_credit_card_on_free_plan.yml
index b1555c5e938..b974a9290d1 100644
--- a/config/feature_flags/development/vueify_shared_runners_toggle.yml
+++ b/config/feature_flags/development/ci_require_credit_card_on_free_plan.yml
@@ -1,8 +1,8 @@
 ---
-name: vueify_shared_runners_toggle
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48452
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292441
-milestone: '13.7'
+name: ci_require_credit_card_on_free_plan
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61152 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330104
+milestone: '13.12'
 type: development
 group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/ci_store_pipeline_messages.yml b/config/feature_flags/development/ci_require_credit_card_on_trial_plan.yml
index 702e4d891a9..370a851bc4d 100644
--- a/config/feature_flags/development/ci_store_pipeline_messages.yml
+++ b/config/feature_flags/development/ci_require_credit_card_on_trial_plan.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_store_pipeline_messages
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33762
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/224199
-milestone: '13.2'
+name: ci_require_credit_card_on_trial_plan
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61152 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330105
+milestone: '13.12'
 type: development
 group: group::continuous integration
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/ci_config_visualization_tab.yml b/config/feature_flags/development/ci_reset_bridge_with_subsequent_jobs.yml
index cdc7322b7fd..c366aac869e 100644
--- a/config/feature_flags/development/ci_config_visualization_tab.yml
+++ b/config/feature_flags/development/ci_reset_bridge_with_subsequent_jobs.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_config_visualization_tab
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48793
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290117
-milestone: '13.7'
+name: ci_reset_bridge_with_subsequent_jobs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60376
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329194
+milestone: '13.12'
 type: development
 group: group::pipeline authoring
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/ci_runner_limits.yml b/config/feature_flags/development/ci_runner_limits.yml
new file mode 100644
index 00000000000..e7d30dd086c
--- /dev/null
+++ b/config/feature_flags/development/ci_runner_limits.yml
@@ -0,0 +1,8 @@
+---
+name: ci_runner_limits
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60157
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329438
+milestone: '13.12'
+type: development
+group: group::runner
+default_enabled: false
diff --git a/config/feature_flags/development/ci_validate_build_dependencies.yml b/config/feature_flags/development/ci_validate_build_dependencies.yml
deleted file mode 100644
index 885bdcf0c20..00000000000
--- a/config/feature_flags/development/ci_validate_build_dependencies.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_validate_build_dependencies
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14009
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/257852
-milestone: '10.3'
-type: development
-group: group::continuous integration
-default_enabled: true
diff --git a/config/feature_flags/development/ci_validate_build_dependencies_override.yml b/config/feature_flags/development/ci_validate_build_dependencies_override.yml
deleted file mode 100644
index bce4b88ca39..00000000000
--- a/config/feature_flags/development/ci_validate_build_dependencies_override.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_validate_build_dependencies_override
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14009
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/257852
-milestone: '10.3'
-type: development
-group: group::continuous integration
-default_enabled: false
diff --git a/config/feature_flags/development/ci_wildcard_file_paths.yml b/config/feature_flags/development/ci_wildcard_file_paths.yml
index 2d21fc8fa41..43a681d171c 100644
--- a/config/feature_flags/development/ci_wildcard_file_paths.yml
+++ b/config/feature_flags/development/ci_wildcard_file_paths.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327315
 milestone: '13.11'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_workflow_rules_variables.yml b/config/feature_flags/development/ci_workflow_rules_variables.yml
index 8915d109c83..427a07c51f6 100644
--- a/config/feature_flags/development/ci_workflow_rules_variables.yml
+++ b/config/feature_flags/development/ci_workflow_rules_variables.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300997
 milestone: '13.11'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/codequality_mr_diff.yml b/config/feature_flags/development/codequality_mr_diff.yml
index ca6846b9390..fe7ad5a8b4f 100644
--- a/config/feature_flags/development/codequality_mr_diff.yml
+++ b/config/feature_flags/development/codequality_mr_diff.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284140
 milestone: '13.7'
 type: development
 group: group::testing
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/compare_repo_dropdown.yml b/config/feature_flags/development/compare_repo_dropdown.yml
index b47bce8c521..e41e4e0d8d7 100644
--- a/config/feature_flags/development/compare_repo_dropdown.yml
+++ b/config/feature_flags/development/compare_repo_dropdown.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/322141
 milestone: '13.9'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/delayed_consistency_for_user_refresh_over_range_worker.yml b/config/feature_flags/development/delayed_consistency_for_user_refresh_over_range_worker.yml
new file mode 100644
index 00000000000..0a7cdea847f
--- /dev/null
+++ b/config/feature_flags/development/delayed_consistency_for_user_refresh_over_range_worker.yml
@@ -0,0 +1,8 @@
+---
+name: delayed_consistency_for_user_refresh_over_range_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61883
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327092
+milestone: '13.12'
+type: development
+group: group::access
+default_enabled: false
diff --git a/config/feature_flags/development/delayed_perform_for_build_hooks_worker.yml b/config/feature_flags/development/delayed_perform_for_build_hooks_worker.yml
new file mode 100644
index 00000000000..45fcf7d21bd
--- /dev/null
+++ b/config/feature_flags/development/delayed_perform_for_build_hooks_worker.yml
@@ -0,0 +1,8 @@
+---
+name: delayed_perform_for_build_hooks_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61149
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330132
+milestone: '13.12'
+type: development
+group: group::memory
+default_enabled: false
diff --git a/config/feature_flags/development/pages_update_legacy_storage.yml b/config/feature_flags/development/deployments_finder_implicitly_enforce_ordering_for_updated_at_filter.yml
index 4a228b4cb8b..68a3de44e88 100644
--- a/config/feature_flags/development/pages_update_legacy_storage.yml
+++ b/config/feature_flags/development/deployments_finder_implicitly_enforce_ordering_for_updated_at_filter.yml
@@ -1,8 +1,8 @@
 ---
-name: pages_update_legacy_storage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50683
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/296138
-milestone: '13.9'
+name: deployments_finder_implicitly_enforce_ordering_for_updated_at_filter
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59771
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329286
+milestone: '13.12'
 type: development
 group: group::release
 default_enabled: true
diff --git a/config/feature_flags/development/jira_for_vulnerabilities.yml b/config/feature_flags/development/destroy_webhooks_before_the_project.yml
index e00bd15cd09..7493822d641 100644
--- a/config/feature_flags/development/jira_for_vulnerabilities.yml
+++ b/config/feature_flags/development/destroy_webhooks_before_the_project.yml
@@ -1,7 +1,8 @@
 ---
-name: jira_for_vulnerabilities
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46982
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276893
+name: destroy_webhooks_before_the_project
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59754
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328393
+milestone: '13.12'
 type: development
-group: group::threat insights
+group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/async_handle_merge_request_assignees_change.yml b/config/feature_flags/development/diff_settings_usage_data.yml
index b44ccb1bd6e..e58552b51c2 100644
--- a/config/feature_flags/development/async_handle_merge_request_assignees_change.yml
+++ b/config/feature_flags/development/diff_settings_usage_data.yml
@@ -1,8 +1,8 @@
 ---
-name: async_handle_merge_request_assignees_change
+name: diff_settings_usage_data
 introduced_by_url:
 rollout_issue_url:
 milestone: '13.11'
 type: development
 group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/resolve_merge_request_todos_async.yml b/config/feature_flags/development/diffs_virtual_scrolling.yml
index db19e439994..2a36c3f0a8b 100644
--- a/config/feature_flags/development/resolve_merge_request_todos_async.yml
+++ b/config/feature_flags/development/diffs_virtual_scrolling.yml
@@ -1,8 +1,8 @@
 ---
-name: resolve_merge_request_todos_async
+name: diffs_virtual_scrolling
 introduced_by_url:
 rollout_issue_url:
-milestone: '13.11'
+milestone: '13.12'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/usage_data_track_ecosystem_slack_service.yml b/config/feature_flags/development/disable_service_templates.yml
index d9d4c06c9fa..07e52224b98 100644
--- a/config/feature_flags/development/usage_data_track_ecosystem_slack_service.yml
+++ b/config/feature_flags/development/disable_service_templates.yml
@@ -1,8 +1,8 @@
 ---
-name: usage_data_track_ecosystem_slack_service
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/322588
-milestone: '13.10'
+name: disable_service_templates
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59098
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327436
+milestone: '13.12'
 type: development
 group: group::ecosystem
 default_enabled: false
diff --git a/config/feature_flags/development/escalation_policies_mvc.yml b/config/feature_flags/development/escalation_policies_mvc.yml
new file mode 100644
index 00000000000..21766f9485e
--- /dev/null
+++ b/config/feature_flags/development/escalation_policies_mvc.yml
@@ -0,0 +1,8 @@
+---
+name: escalation_policies_mvc
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60524
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329347
+milestone: '13.12'
+type: development
+group: group::monitor
+default_enabled: false
diff --git a/config/feature_flags/development/set_user_availability_status.yml b/config/feature_flags/development/find_remote_root_refs_inmemory.yml
index dd48ddef6d5..18e2e2b366a 100644
--- a/config/feature_flags/development/set_user_availability_status.yml
+++ b/config/feature_flags/development/find_remote_root_refs_inmemory.yml
@@ -1,8 +1,8 @@
 ---
-name: set_user_availability_status
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46844
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/281073
-milestone: '13.6'
+name: find_remote_root_refs_inmemory
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60583
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329664
+milestone: '13.12'
 type: development
-group: group::optimize
+group: group::gitaly
 default_enabled: true
diff --git a/config/feature_flags/development/global_default_branch_name.yml b/config/feature_flags/development/global_default_branch_name.yml
deleted file mode 100644
index 488c9fb47c8..00000000000
--- a/config/feature_flags/development/global_default_branch_name.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: global_default_branch_name
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35269
-rollout_issue_url: 
-milestone: '13.2'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/development/graphql_milestone_stats.yml b/config/feature_flags/development/graphql_milestone_stats.yml
deleted file mode 100644
index 2f09f2b188a..00000000000
--- a/config/feature_flags/development/graphql_milestone_stats.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: graphql_milestone_stats
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35066
-rollout_issue_url: 
-milestone: '13.2'
-type: development
-group: group::release
-default_enabled: true
diff --git a/config/feature_flags/development/graphql_release_data.yml b/config/feature_flags/development/graphql_release_data.yml
deleted file mode 100644
index a49d0ee1a6a..00000000000
--- a/config/feature_flags/development/graphql_release_data.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: graphql_release_data
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30753
-rollout_issue_url: 
-milestone: '13.0'
-type: development
-group: group::release
-default_enabled: true
diff --git a/config/feature_flags/development/graphql_releases_page.yml b/config/feature_flags/development/graphql_releases_page.yml
deleted file mode 100644
index b267f0543ec..00000000000
--- a/config/feature_flags/development/graphql_releases_page.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: graphql_releases_page
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33095
-rollout_issue_url: 
-milestone: '13.4'
-type: development
-group: group::release
-default_enabled: true
diff --git a/config/feature_flags/development/group_devops_adoption.yml b/config/feature_flags/development/group_devops_adoption.yml
index 336a4d6d5a0..112336eae7c 100644
--- a/config/feature_flags/development/group_devops_adoption.yml
+++ b/config/feature_flags/development/group_devops_adoption.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323159
 milestone: '13.10'
 type: development
 group: group::optimize
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/import_project_from_remote_file.yml b/config/feature_flags/development/import_project_from_remote_file.yml
new file mode 100644
index 00000000000..9a44491172c
--- /dev/null
+++ b/config/feature_flags/development/import_project_from_remote_file.yml
@@ -0,0 +1,8 @@
+---
+name: import_project_from_remote_file
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59033
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330039
+milestone: '13.12'
+type: development
+group: group::import
+default_enabled: false
diff --git a/config/feature_flags/development/improved_emoji_picker.yml b/config/feature_flags/development/improved_emoji_picker.yml
index 2d72c38630a..211f0264446 100644
--- a/config/feature_flags/development/improved_emoji_picker.yml
+++ b/config/feature_flags/development/improved_emoji_picker.yml
@@ -5,4 +5,4 @@ rollout_issue_url:
 milestone: '13.9'
 type: development
 group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/issue_rebalancing_with_retry.yml b/config/feature_flags/development/issue_rebalancing_with_retry.yml
new file mode 100644
index 00000000000..cba1b77f26e
--- /dev/null
+++ b/config/feature_flags/development/issue_rebalancing_with_retry.yml
@@ -0,0 +1,8 @@
+---
+name: issue_rebalancing_with_retry
+introduced_by_url:
+rollout_issue_url:
+milestone: '13.11'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/junit_pipeline_screenshots_view.yml b/config/feature_flags/development/junit_pipeline_screenshots_view.yml
deleted file mode 100644
index eae38966064..00000000000
--- a/config/feature_flags/development/junit_pipeline_screenshots_view.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: junit_pipeline_screenshots_view
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31029
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/202114
-milestone: '13.0'
-type: development
-group: group::verify testing
-default_enabled: false
diff --git a/config/feature_flags/development/lfs_integrity_inspect_quarantined_objects.yml b/config/feature_flags/development/lfs_integrity_inspect_quarantined_objects.yml
deleted file mode 100644
index f8b589c0a4f..00000000000
--- a/config/feature_flags/development/lfs_integrity_inspect_quarantined_objects.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: lfs_integrity_inspect_quarantined_objects
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58634
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327440
-milestone: '13.11'
-type: development
-group: group::gitaly
-default_enabled: false
diff --git a/config/feature_flags/development/sort_diffs.yml b/config/feature_flags/development/limited_diff_highlighting.yml
index 49f04c30f49..1cfd9927c7a 100644
--- a/config/feature_flags/development/sort_diffs.yml
+++ b/config/feature_flags/development/limited_diff_highlighting.yml
@@ -1,8 +1,8 @@
 ---
-name: sort_diffs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49118
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/293819
-milestone: '13.7'
+name: limited_diff_highlighting
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53768
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323566
+milestone: '13.12'
 type: development
-group: group::code review
+group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/load_balancing_atomic_replica.yml b/config/feature_flags/development/load_balancing_atomic_replica.yml
index fb0707849d4..4eb55427507 100644
--- a/config/feature_flags/development/load_balancing_atomic_replica.yml
+++ b/config/feature_flags/development/load_balancing_atomic_replica.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49294
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/291193
 milestone: '13.11'
 type: development
-group:
-default_enabled: false
+group: group::database
+default_enabled: true
diff --git a/config/feature_flags/development/new_pipeline_form.yml b/config/feature_flags/development/load_balancing_for_pipeline_process_worker.yml
index 3a4b30f4bd9..08d7f6617d2 100644
--- a/config/feature_flags/development/new_pipeline_form.yml
+++ b/config/feature_flags/development/load_balancing_for_pipeline_process_worker.yml
@@ -1,8 +1,8 @@
 ---
-name: new_pipeline_form
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35674
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229632
-milestone: '13.2'
+name: load_balancing_for_pipeline_process_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61766
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330960
+milestone: '13.12'
 type: development
 group: group::continuous integration
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/main_branch_over_master.yml b/config/feature_flags/development/main_branch_over_master.yml
new file mode 100644
index 00000000000..5a0c08c25f0
--- /dev/null
+++ b/config/feature_flags/development/main_branch_over_master.yml
@@ -0,0 +1,8 @@
+---
+name: main_branch_over_master
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60258
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329190
+milestone: '13.12'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/maven_packages_group_level_improvements.yml b/config/feature_flags/development/maven_packages_group_level_improvements.yml
deleted file mode 100644
index 8dfd5ab0f8b..00000000000
--- a/config/feature_flags/development/maven_packages_group_level_improvements.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: maven_packages_group_level_improvements
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57600
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326099
-milestone: '13.11'
-type: development
-group: group::package
-default_enabled: true
diff --git a/config/feature_flags/development/merge_base_pipeline_for_metrics_comparison.yml b/config/feature_flags/development/merge_base_pipeline_for_metrics_comparison.yml
new file mode 100644
index 00000000000..1fdb8d5bc6d
--- /dev/null
+++ b/config/feature_flags/development/merge_base_pipeline_for_metrics_comparison.yml
@@ -0,0 +1,8 @@
+---
+name: merge_base_pipeline_for_metrics_comparison
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61282
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330809
+milestone: '13.12'
+type: development
+group: group::testing
+default_enabled: false
diff --git a/config/feature_flags/development/migrate_user_mentions.yml b/config/feature_flags/development/migrate_user_mentions.yml
index 2b250994b5a..2a0e84b01c1 100644
--- a/config/feature_flags/development/migrate_user_mentions.yml
+++ b/config/feature_flags/development/migrate_user_mentions.yml
@@ -1,4 +1,7 @@
 ---
+# While this FF is enabled by default, we want to keep it in place for now as there are still related migrations that
+# have not been run in production yet. For additional info, see https://gitlab.com/gitlab-org/gitlab/-/issues/21801
+# Discussion and removal MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60322
 name: migrate_user_mentions
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34378
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/231175
diff --git a/config/feature_flags/development/ci_no_empty_groups.yml b/config/feature_flags/development/multiple_oncall_schedules.yml
index ef7d6459a5a..c1640c30e8e 100644
--- a/config/feature_flags/development/ci_no_empty_groups.yml
+++ b/config/feature_flags/development/multiple_oncall_schedules.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_no_empty_groups
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58789
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327139
+name: multiple_oncall_schedules
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59829
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328474
 milestone: '13.11'
 type: development
-group: group::verify
+group: group::monitor
 default_enabled: false
diff --git a/config/feature_flags/development/new_graphql_keyset_pagination.yml b/config/feature_flags/development/new_graphql_keyset_pagination.yml
new file mode 100644
index 00000000000..f4afcba68cf
--- /dev/null
+++ b/config/feature_flags/development/new_graphql_keyset_pagination.yml
@@ -0,0 +1,8 @@
+---
+name: new_graphql_keyset_pagination
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56751
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323730
+milestone: '13.10'
+type: development
+group: group::optimize
+default_enabled: false
diff --git a/config/feature_flags/development/notification_setting_recipient_refactor.yml b/config/feature_flags/development/notification_setting_recipient_refactor.yml
index 7379fe42166..8e070034170 100644
--- a/config/feature_flags/development/notification_setting_recipient_refactor.yml
+++ b/config/feature_flags/development/notification_setting_recipient_refactor.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327303
 milestone: '13.11'
 type: development
 group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/optimize_linkable_attributes.yml b/config/feature_flags/development/optimize_linkable_attributes.yml
new file mode 100644
index 00000000000..8f35306b4ac
--- /dev/null
+++ b/config/feature_flags/development/optimize_linkable_attributes.yml
@@ -0,0 +1,8 @@
+---
+name: optimize_linkable_attributes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59983
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328696
+milestone: '13.12'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/optimized_issuable_label_filter.yml b/config/feature_flags/development/optimized_issuable_label_filter.yml
index 8385b85e143..cc4e8aa2fa9 100644
--- a/config/feature_flags/development/optimized_issuable_label_filter.yml
+++ b/config/feature_flags/development/optimized_issuable_label_filter.yml
@@ -1,7 +1,7 @@
 ---
 name: optimized_issuable_label_filter
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34503
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/259719
 milestone: '13.4'
 type: development
 group: group::optimize
diff --git a/config/feature_flags/development/optimized_timebox_queries.yml b/config/feature_flags/development/optimized_timebox_queries.yml
deleted file mode 100644
index eea0b149079..00000000000
--- a/config/feature_flags/development/optimized_timebox_queries.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: optimized_timebox_queries
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/32953
-rollout_issue_url:  https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34043
-milestone: '13.1'
-type: development
-group: group::project management
-default_enabled: true
diff --git a/config/feature_flags/development/packages_finder_helper_deploy_token.yml b/config/feature_flags/development/packages_finder_helper_deploy_token.yml
index fcc73cafd64..b847942706a 100644
--- a/config/feature_flags/development/packages_finder_helper_deploy_token.yml
+++ b/config/feature_flags/development/packages_finder_helper_deploy_token.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326808
 milestone: '13.11'
 type: development
 group: group::package
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/pages_serve_from_legacy_storage.yml b/config/feature_flags/development/pages_serve_from_legacy_storage.yml
deleted file mode 100644
index 37d83106737..00000000000
--- a/config/feature_flags/development/pages_serve_from_legacy_storage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: pages_serve_from_legacy_storage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/297228
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/297524
-milestone: '13.8'
-type: development
-group: group::release
-default_enabled: true
diff --git a/config/feature_flags/development/multiple_cache_per_job.yml b/config/feature_flags/development/pipeline_editor_drawer.yml
index f65354cce2c..df73c4be01e 100644
--- a/config/feature_flags/development/multiple_cache_per_job.yml
+++ b/config/feature_flags/development/pipeline_editor_drawer.yml
@@ -1,8 +1,8 @@
 ---
-name: multiple_cache_per_job
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53410
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321877
-milestone: '13.10'
+name: pipeline_editor_drawer
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60856
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329806
+milestone: '13.12'
 type: development
 group: group::pipeline authoring
 default_enabled: true
diff --git a/config/feature_flags/development/pipeline_graph_layers_view.yml b/config/feature_flags/development/pipeline_graph_layers_view.yml
index fae3e118226..49f24c00fd3 100644
--- a/config/feature_flags/development/pipeline_graph_layers_view.yml
+++ b/config/feature_flags/development/pipeline_graph_layers_view.yml
@@ -1,8 +1,8 @@
 ---
 name: pipeline_graph_layers_view
-introduced_by_url:
-rollout_issue_url:
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56865
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328538
 milestone: '13.11'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/pipeline_status_for_pipeline_editor.yml b/config/feature_flags/development/pipeline_status_for_pipeline_editor.yml
deleted file mode 100644
index a24d9423269..00000000000
--- a/config/feature_flags/development/pipeline_status_for_pipeline_editor.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: pipeline_status_for_pipeline_editor
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53797
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321518
-milestone: '13.10'
-type: development
-group: group::pipeline authoring
-default_enabled: true
diff --git a/config/feature_flags/development/pages_serve_with_zip_file_protocol.yml b/config/feature_flags/development/remove_description_html_in_release_api.yml
index 153b0d5915c..0c457dfe2e0 100644
--- a/config/feature_flags/development/pages_serve_with_zip_file_protocol.yml
+++ b/config/feature_flags/development/remove_description_html_in_release_api.yml
@@ -1,8 +1,8 @@
 ---
-name: pages_serve_with_zip_file_protocol
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46320
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321677
-milestone: '13.6'
+name: remove_description_html_in_release_api
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60380
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329188
+milestone: '13.12'
 type: development
 group: group::release
 default_enabled: true
diff --git a/config/feature_flags/development/remove_description_html_in_release_api_override.yml b/config/feature_flags/development/remove_description_html_in_release_api_override.yml
new file mode 100644
index 00000000000..f924f2ccbd5
--- /dev/null
+++ b/config/feature_flags/development/remove_description_html_in_release_api_override.yml
@@ -0,0 +1,8 @@
+---
+name: remove_description_html_in_release_api_override
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60380
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329188
+milestone: '13.12'
+type: development
+group: group::release
+default_enabled: false
diff --git a/config/feature_flags/development/runner_graphql_query.yml b/config/feature_flags/development/runner_graphql_query.yml
new file mode 100644
index 00000000000..1ad90d362d0
--- /dev/null
+++ b/config/feature_flags/development/runner_graphql_query.yml
@@ -0,0 +1,8 @@
+---
+name: runner_graphql_query
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59763
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328700
+milestone:
+type: development
+group: group::runner
+default_enabled: false
diff --git a/config/feature_flags/development/search_track_unique_users.yml b/config/feature_flags/development/search_track_unique_users.yml
deleted file mode 100644
index 641636fd955..00000000000
--- a/config/feature_flags/development/search_track_unique_users.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: search_track_unique_users
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40134
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/240906
-milestone: '13.4'
-type: development
-group: group::global search
-default_enabled: true
diff --git a/config/feature_flags/development/security_dast_site_profiles_api_option.yml b/config/feature_flags/development/security_dast_site_profiles_api_option.yml
index a92e761d3ce..8a9c6fefb5d 100644
--- a/config/feature_flags/development/security_dast_site_profiles_api_option.yml
+++ b/config/feature_flags/development/security_dast_site_profiles_api_option.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325130
 milestone: '13.12'
 type: development
 group: group::dynamic analysis
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/sentry_processors_before_send.yml b/config/feature_flags/development/sentry_processors_before_send.yml
deleted file mode 100644
index 19e88699b66..00000000000
--- a/config/feature_flags/development/sentry_processors_before_send.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: sentry_processors_before_send
-introduced_by_url:
-rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/849#processors
-milestone: '13.11'
-type: development
-group: team::Scalability
-default_enabled: false
diff --git a/config/feature_flags/development/show_relevant_approval_rule_approvers.yml b/config/feature_flags/development/show_relevant_approval_rule_approvers.yml
new file mode 100644
index 00000000000..40a486e380b
--- /dev/null
+++ b/config/feature_flags/development/show_relevant_approval_rule_approvers.yml
@@ -0,0 +1,8 @@
+---
+name: show_relevant_approval_rule_approvers
+introduced_by_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329153
+milestone: '13.12'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/project_sidebar_refactor.yml b/config/feature_flags/development/sidebar_refactor.yml
index 88cca9d8d13..317fbee87f5 100644
--- a/config/feature_flags/development/project_sidebar_refactor.yml
+++ b/config/feature_flags/development/sidebar_refactor.yml
@@ -1,5 +1,5 @@
 ---
-name: project_sidebar_refactor
+name: sidebar_refactor
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58638
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326111
 milestone: '13.11'
diff --git a/config/feature_flags/development/ssh_key_expiration_email_notification.yml b/config/feature_flags/development/ssh_key_expiration_email_notification.yml
index ee051a4648b..f1d081dad18 100644
--- a/config/feature_flags/development/ssh_key_expiration_email_notification.yml
+++ b/config/feature_flags/development/ssh_key_expiration_email_notification.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326386
 milestone: '13.11'
 type: development
 group: group::compliance
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/sync_traversal_ids.yml b/config/feature_flags/development/sync_traversal_ids.yml
index 52777c502e6..bd612f9646c 100644
--- a/config/feature_flags/development/sync_traversal_ids.yml
+++ b/config/feature_flags/development/sync_traversal_ids.yml
@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52854
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321947
 group: group::access
 type: development
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_mr_diffs.yml b/config/feature_flags/development/track_epic_boards_activity.yml
index a85ceaf2520..6461a9e826c 100644
--- a/config/feature_flags/development/usage_data_i_code_review_mr_diffs.yml
+++ b/config/feature_flags/development/track_epic_boards_activity.yml
@@ -1,8 +1,8 @@
 ---
-name: usage_data_i_code_review_mr_diffs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48470
+name: track_epic_boards_activity
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60357
 rollout_issue_url:
-milestone: '13.7'
+milestone: '13.12'
 type: development
-group: group::code review
+group: group::product planning
 default_enabled: true
diff --git a/config/feature_flags/development/code_review_async_pipeline_creation.yml b/config/feature_flags/development/track_file_size_over_highlight_limit.yml
index d0e5a3286aa..431c646f54d 100644
--- a/config/feature_flags/development/code_review_async_pipeline_creation.yml
+++ b/config/feature_flags/development/track_file_size_over_highlight_limit.yml
@@ -1,8 +1,8 @@
 ---
-name: code_review_async_pipeline_creation
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58542
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327559
-milestone: '13.11'
+name: track_file_size_over_highlight_limit
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61273
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330374
+milestone: '13.12'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/destroy_issuable_todos_async.yml b/config/feature_flags/development/track_highlight_timeouts.yml
index c39e551bdd9..a85749e5187 100644
--- a/config/feature_flags/development/destroy_issuable_todos_async.yml
+++ b/config/feature_flags/development/track_highlight_timeouts.yml
@@ -1,8 +1,8 @@
 ---
-name: destroy_issuable_todos_async
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57830
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325689
-milestone: '13.11'
+name: track_highlight_timeouts
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60956
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329909
+milestone: '13.12'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/track_unique_visits.yml b/config/feature_flags/development/track_unique_visits.yml
index b11539e830b..dd053211070 100644
--- a/config/feature_flags/development/track_unique_visits.yml
+++ b/config/feature_flags/development/track_unique_visits.yml
@@ -1,7 +1,7 @@
 ---
 name: track_unique_visits
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33146
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255994
 milestone: '13.2'
 type: development
 group: group::optimize
diff --git a/config/feature_flags/development/upgrade_link_in_user_menu_a.yml b/config/feature_flags/development/upgrade_link_in_user_menu_a.yml
deleted file mode 100644
index 8ee4cf0ecbf..00000000000
--- a/config/feature_flags/development/upgrade_link_in_user_menu_a.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: upgrade_link_in_user_menu_a
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56591
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300824
-milestone: '13.11'
-type: development
-group: group::expansion
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_a_compliance_audit_events_api.yml b/config/feature_flags/development/usage_data_a_compliance_audit_events_api.yml
deleted file mode 100644
index 9d668c73052..00000000000
--- a/config/feature_flags/development/usage_data_a_compliance_audit_events_api.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_a_compliance_audit_events_api
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41689
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/233786
-milestone: '13.4'
-type: development
-group: group::compliance
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_edit_mr_desc.yml b/config/feature_flags/development/usage_data_i_code_review_edit_mr_desc.yml
deleted file mode 100644
index cd49759c1d8..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_edit_mr_desc.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_edit_mr_desc
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292830
-rollout_issue_url:
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_edit_mr_title.yml b/config/feature_flags/development/usage_data_i_code_review_edit_mr_title.yml
deleted file mode 100644
index 61d238b312a..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_edit_mr_title.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_edit_mr_title
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292830
-rollout_issue_url:
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_mr_single_file_diffs.yml b/config/feature_flags/development/usage_data_i_code_review_mr_single_file_diffs.yml
deleted file mode 100644
index cc9623f6cf4..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_mr_single_file_diffs.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_mr_single_file_diffs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48470
-rollout_issue_url:
-milestone: '13.7'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_add_suggestion.yml b/config/feature_flags/development/usage_data_i_code_review_user_add_suggestion.yml
deleted file mode 100644
index 832be26d50d..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_add_suggestion.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_add_suggestion
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52189
-rollout_issue_url:
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_apply_suggestion.yml b/config/feature_flags/development/usage_data_i_code_review_user_apply_suggestion.yml
deleted file mode 100644
index 03aa1691825..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_apply_suggestion.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_apply_suggestion
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52189
-rollout_issue_url:
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_approval_rule_added.yml b/config/feature_flags/development/usage_data_i_code_review_user_approval_rule_added.yml
deleted file mode 100644
index 749b17f9e0c..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_approval_rule_added.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_approval_rule_added
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/320966
-rollout_issue_url:
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_approval_rule_deleted.yml b/config/feature_flags/development/usage_data_i_code_review_user_approval_rule_deleted.yml
deleted file mode 100644
index ef97df30aeb..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_approval_rule_deleted.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_approval_rule_deleted
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/320966
-rollout_issue_url:
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_approval_rule_edited.yml b/config/feature_flags/development/usage_data_i_code_review_user_approval_rule_edited.yml
deleted file mode 100644
index 5ecdaf3a2d0..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_approval_rule_edited.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_approval_rule_edited
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/320966
-rollout_issue_url:
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_approve_mr.yml b/config/feature_flags/development/usage_data_i_code_review_user_approve_mr.yml
deleted file mode 100644
index c20d201de7c..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_approve_mr.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_approve_mr
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53201
-rollout_issue_url:
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_assigned.yml b/config/feature_flags/development/usage_data_i_code_review_user_assigned.yml
deleted file mode 100644
index f18208e44dc..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_assigned.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_assigned
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52194
-rollout_issue_url: 
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_assignees_changed.yml b/config/feature_flags/development/usage_data_i_code_review_user_assignees_changed.yml
deleted file mode 100644
index ac7edd86e5f..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_assignees_changed.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_assignees_changed
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55486
-rollout_issue_url:
-milestone: '13.10'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_close_mr.yml b/config/feature_flags/development/usage_data_i_code_review_user_close_mr.yml
deleted file mode 100644
index 777914da403..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_close_mr.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_close_mr
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50654
-rollout_issue_url: 
-milestone: '13.8'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_create_mr.yml b/config/feature_flags/development/usage_data_i_code_review_user_create_mr.yml
deleted file mode 100644
index beb211c6f35..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_create_mr.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_create_mr
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50654
-rollout_issue_url: 
-milestone: '13.8'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_create_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_create_mr_comment.yml
deleted file mode 100644
index 1c727263a8e..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_create_mr_comment.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_create_mr_comment
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50849
-rollout_issue_url: 
-milestone: '13.8'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_create_mr_from_issue.yml b/config/feature_flags/development/usage_data_i_code_review_user_create_mr_from_issue.yml
deleted file mode 100644
index 1cd95061a66..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_create_mr_from_issue.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_create_mr_from_issue
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53808
-rollout_issue_url: 
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_create_multiline_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_create_multiline_mr_comment.yml
deleted file mode 100644
index 4777926d4b1..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_create_multiline_mr_comment.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_create_multiline_mr_comment
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51098
-rollout_issue_url: 
-milestone: '13.8'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_create_review_note.yml b/config/feature_flags/development/usage_data_i_code_review_user_create_review_note.yml
deleted file mode 100644
index fdc3b4569ef..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_create_review_note.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_create_review_note
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51521
-rollout_issue_url: 
-milestone: '13.8'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_edit_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_edit_mr_comment.yml
deleted file mode 100644
index 2280cfdd564..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_edit_mr_comment.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_edit_mr_comment
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50849
-rollout_issue_url: 
-milestone: '13.8'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_edit_multiline_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_edit_multiline_mr_comment.yml
deleted file mode 100644
index b4b34b4e166..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_edit_multiline_mr_comment.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_edit_multiline_mr_comment
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51098
-rollout_issue_url: 
-milestone: '13.8'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_labels_changed.yml b/config/feature_flags/development/usage_data_i_code_review_user_labels_changed.yml
deleted file mode 100644
index d70c6c963e8..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_labels_changed.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_labels_changed
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55484
-rollout_issue_url:
-milestone: '13.10'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_marked_as_draft.yml b/config/feature_flags/development/usage_data_i_code_review_user_marked_as_draft.yml
deleted file mode 100644
index 82dc1582558..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_marked_as_draft.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_marked_as_draft
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/301223
-rollout_issue_url:
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_merge_mr.yml b/config/feature_flags/development/usage_data_i_code_review_user_merge_mr.yml
deleted file mode 100644
index 0ef596ac915..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_merge_mr.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_merge_mr
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50654
-rollout_issue_url: 
-milestone: '13.8'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_milestone_changed.yml b/config/feature_flags/development/usage_data_i_code_review_user_milestone_changed.yml
deleted file mode 100644
index 0f64b7639c5..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_milestone_changed.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_milestone_changed
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55484
-rollout_issue_url:
-milestone: '13.10'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_mr_discussion_locked.yml b/config/feature_flags/development/usage_data_i_code_review_user_mr_discussion_locked.yml
deleted file mode 100644
index e6e81f48028..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_mr_discussion_locked.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_mr_discussion_locked
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55069
-rollout_issue_url:
-milestone: '13.10'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_mr_discussion_unlocked.yml b/config/feature_flags/development/usage_data_i_code_review_user_mr_discussion_unlocked.yml
deleted file mode 100644
index 03ec6cde34b..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_mr_discussion_unlocked.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_mr_discussion_unlocked
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55069
-rollout_issue_url:
-milestone: '13.10'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_publish_review.yml b/config/feature_flags/development/usage_data_i_code_review_user_publish_review.yml
deleted file mode 100644
index 079ceb023f4..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_publish_review.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_publish_review
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51351
-rollout_issue_url: 
-milestone: '13.8'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_remove_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_remove_mr_comment.yml
deleted file mode 100644
index c7d462e9243..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_remove_mr_comment.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_remove_mr_comment
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50849
-rollout_issue_url: 
-milestone: '13.8'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_remove_multiline_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_remove_multiline_mr_comment.yml
deleted file mode 100644
index b8ec5984788..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_remove_multiline_mr_comment.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_remove_multiline_mr_comment
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51098
-rollout_issue_url: 
-milestone: '13.8'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_reopen_mr.yml b/config/feature_flags/development/usage_data_i_code_review_user_reopen_mr.yml
deleted file mode 100644
index 9a5c2ecc26a..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_reopen_mr.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_reopen_mr
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50654
-rollout_issue_url: 
-milestone: '13.8'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_resolve_thread.yml b/config/feature_flags/development/usage_data_i_code_review_user_resolve_thread.yml
deleted file mode 100644
index 8c7af83bab4..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_resolve_thread.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_resolve_thread
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52130
-rollout_issue_url:
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_review_requested.yml b/config/feature_flags/development/usage_data_i_code_review_user_review_requested.yml
deleted file mode 100644
index 540ac1f61e1..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_review_requested.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_review_requested
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52194
-rollout_issue_url: 
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_reviewers_changed.yml b/config/feature_flags/development/usage_data_i_code_review_user_reviewers_changed.yml
deleted file mode 100644
index 10084b70ee8..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_reviewers_changed.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_reviewers_changed
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55486
-rollout_issue_url:
-milestone: '13.10'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_single_file_diffs.yml b/config/feature_flags/development/usage_data_i_code_review_user_single_file_diffs.yml
deleted file mode 100644
index f77b15f9442..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_single_file_diffs.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_single_file_diffs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48470
-rollout_issue_url:
-milestone: '13.7'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_time_estimate_changed.yml b/config/feature_flags/development/usage_data_i_code_review_user_time_estimate_changed.yml
deleted file mode 100644
index 81096288a8d..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_time_estimate_changed.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_time_estimate_changed
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55046
-rollout_issue_url:
-milestone: '13.10'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_time_spent_changed.yml b/config/feature_flags/development/usage_data_i_code_review_user_time_spent_changed.yml
deleted file mode 100644
index 56329f6b48b..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_time_spent_changed.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_time_spent_changed
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55046
-rollout_issue_url:
-milestone: '13.10'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_toggled_task_item_status.yml b/config/feature_flags/development/usage_data_i_code_review_user_toggled_task_item_status.yml
deleted file mode 100644
index f2db27d0549..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_toggled_task_item_status.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_toggled_task_item_status
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/320851
-rollout_issue_url:
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_unapprove_mr.yml b/config/feature_flags/development/usage_data_i_code_review_user_unapprove_mr.yml
deleted file mode 100644
index 9d31ad6a482..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_unapprove_mr.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_unapprove_mr
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53201
-rollout_issue_url:
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_unmarked_as_draft.yml b/config/feature_flags/development/usage_data_i_code_review_user_unmarked_as_draft.yml
deleted file mode 100644
index 9582562ff74..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_unmarked_as_draft.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_unmarked_as_draft
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/301223
-rollout_issue_url:
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_unresolve_thread.yml b/config/feature_flags/development/usage_data_i_code_review_user_unresolve_thread.yml
deleted file mode 100644
index 49b860416c5..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_unresolve_thread.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_unresolve_thread
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52130
-rollout_issue_url:
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_vs_code_api_request.yml b/config/feature_flags/development/usage_data_i_code_review_user_vs_code_api_request.yml
deleted file mode 100644
index 531832ad633..00000000000
--- a/config/feature_flags/development/usage_data_i_code_review_user_vs_code_api_request.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_code_review_user_vs_code_api_request
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52484
-rollout_issue_url: 
-milestone: '13.9'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_alert_assigned.yml b/config/feature_flags/development/usage_data_incident_management_alert_assigned.yml
deleted file mode 100644
index bc9aaef47ef..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_alert_assigned.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_incident_management_alert_assigned
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-milestone: '13.4'
-type: development
-group: group::monitor
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_alert_create_incident.yml b/config/feature_flags/development/usage_data_incident_management_alert_create_incident.yml
deleted file mode 100644
index 63432e2f476..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_alert_create_incident.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_incident_management_alert_create_incident
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48087
-rollout_issue_url:
-milestone: '13.7'
-type: development
-group: group::monitor
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_alert_status_changed.yml b/config/feature_flags/development/usage_data_incident_management_alert_status_changed.yml
deleted file mode 100644
index 2868f920d5b..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_alert_status_changed.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_incident_management_alert_status_changed
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-milestone: '13.4'
-type: development
-group: group::monitor
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_alert_todo.yml b/config/feature_flags/development/usage_data_incident_management_alert_todo.yml
deleted file mode 100644
index f5133676231..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_alert_todo.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_incident_management_alert_todo
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-milestone: '13.4'
-type: development
-group: group::monitor
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_assigned.yml b/config/feature_flags/development/usage_data_incident_management_incident_assigned.yml
deleted file mode 100644
index 14fc5f92744..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_incident_assigned.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_incident_management_incident_assigned
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-milestone: '13.4'
-type: development
-group: group::monitor
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_change_confidential.yml b/config/feature_flags/development/usage_data_incident_management_incident_change_confidential.yml
deleted file mode 100644
index 8babb4557a6..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_incident_change_confidential.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_incident_management_incident_change_confidential
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-milestone: '13.4'
-type: development
-group: group::monitor
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_closed.yml b/config/feature_flags/development/usage_data_incident_management_incident_closed.yml
deleted file mode 100644
index 474466dd057..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_incident_closed.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_incident_management_incident_closed
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-milestone: '13.4'
-type: development
-group: group::monitor
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_comment.yml b/config/feature_flags/development/usage_data_incident_management_incident_comment.yml
deleted file mode 100644
index 6c6f9a58071..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_incident_comment.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_incident_management_incident_comment
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-milestone: '13.4'
-type: development
-group: group::monitor
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_created.yml b/config/feature_flags/development/usage_data_incident_management_incident_created.yml
deleted file mode 100644
index 4a9b742c0ef..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_incident_created.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_incident_management_incident_created
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-milestone: '13.4'
-type: development
-group: group::monitor
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_relate.yml b/config/feature_flags/development/usage_data_incident_management_incident_relate.yml
deleted file mode 100644
index 08bdd429fc3..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_incident_relate.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_incident_management_incident_relate
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-milestone: '13.4'
-type: development
-group: group::monitor
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_reopened.yml b/config/feature_flags/development/usage_data_incident_management_incident_reopened.yml
deleted file mode 100644
index 4785c8224e4..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_incident_reopened.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_incident_management_incident_reopened
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-milestone: '13.4'
-type: development
-group: group::monitor
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_todo.yml b/config/feature_flags/development/usage_data_incident_management_incident_todo.yml
deleted file mode 100644
index 8dc2e623caf..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_incident_todo.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_incident_management_incident_todo
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-milestone: '13.4'
-type: development
-group: group::monitor
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_unrelate.yml b/config/feature_flags/development/usage_data_incident_management_incident_unrelate.yml
deleted file mode 100644
index 90226a7c3e2..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_incident_unrelate.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_incident_management_incident_unrelate
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-milestone: '13.4'
-type: development
-group: group::monitor
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_zoom_meeting.yml b/config/feature_flags/development/usage_data_incident_management_incident_zoom_meeting.yml
deleted file mode 100644
index c00f79d1e05..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_incident_zoom_meeting.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_incident_management_incident_zoom_meeting
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-milestone: '13.4'
-type: development
-group: group::monitor
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_track_quickactions.yml b/config/feature_flags/development/usage_data_track_quickactions.yml
deleted file mode 100644
index 3e2a2fe8927..00000000000
--- a/config/feature_flags/development/usage_data_track_quickactions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_track_quickactions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52398
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321054
-milestone: '13.9'
-type: development
-group: group::project management
-default_enabled: true
diff --git a/config/feature_flags/development/use_distinct_in_shas_cte.yml b/config/feature_flags/development/use_distinct_in_shas_cte.yml
new file mode 100644
index 00000000000..e93fb48be5d
--- /dev/null
+++ b/config/feature_flags/development/use_distinct_in_shas_cte.yml
@@ -0,0 +1,8 @@
+---
+name: use_distinct_in_shas_cte
+introduced_by_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330586
+milestone: '13.12'
+type: development
+group: group::optimize
+default_enabled: false
diff --git a/config/feature_flags/development/gitaly_replace_wiki_delete_page.yml b/config/feature_flags/development/use_traversal_ids_for_ancestors.yml
index 40100bb2fe6..57804957192 100644
--- a/config/feature_flags/development/gitaly_replace_wiki_delete_page.yml
+++ b/config/feature_flags/development/use_traversal_ids_for_ancestors.yml
@@ -1,8 +1,8 @@
 ---
-name: gitaly_replace_wiki_delete_page
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56495
+name: use_traversal_ids_for_ancestors
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57137
 rollout_issue_url:
-milestone: '13.10'
+milestone: '13.12'
 type: development
-group: group::editor
+group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/user_group_counts.yml b/config/feature_flags/development/user_group_counts.yml
deleted file mode 100644
index 98798ea3ead..00000000000
--- a/config/feature_flags/development/user_group_counts.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: user_group_counts
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44069/
-rollout_issue_url: 
-milestone: '13.6'
-type: development
-group: group::compliance
-default_enabled: false
diff --git a/config/feature_flags/development/vue_admin_users.yml b/config/feature_flags/development/vue_admin_users.yml
index 7464a25c0da..d7a37542cfd 100644
--- a/config/feature_flags/development/vue_admin_users.yml
+++ b/config/feature_flags/development/vue_admin_users.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290737
 milestone: '13.7'
 type: development
 group: group::compliance
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/api_always_use_application_json.yml b/config/feature_flags/development/web_hooks_disable_failed.yml
index daa8b15c25f..a54034d73e8 100644
--- a/config/feature_flags/development/api_always_use_application_json.yml
+++ b/config/feature_flags/development/web_hooks_disable_failed.yml
@@ -1,8 +1,8 @@
 ---
-name: api_always_use_application_json
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42229
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/270067
-milestone: '13.6'
+name: web_hooks_disable_failed
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60837
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329849
+milestone: '13.12'
 type: development
 group: group::ecosystem
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/web_hooks_rate_limit.yml b/config/feature_flags/development/web_hooks_rate_limit.yml
new file mode 100644
index 00000000000..193d51bb250
--- /dev/null
+++ b/config/feature_flags/development/web_hooks_rate_limit.yml
@@ -0,0 +1,8 @@
+---
+name: web_hooks_rate_limit
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61151
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330133
+milestone: '13.12'
+type: development
+group: group::ecosystem
+default_enabled: false
diff --git a/config/feature_flags/development/wiki_content_editor.yml b/config/feature_flags/development/wiki_content_editor.yml
new file mode 100644
index 00000000000..f4d86f01465
--- /dev/null
+++ b/config/feature_flags/development/wiki_content_editor.yml
@@ -0,0 +1,7 @@
+---
+name: wiki_content_editor
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57370
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255919
+group: group::editor
+type: development
+default_enabled: false
diff --git a/config/feature_flags/experiment/ci_syntax_templates_b_experiment_percentage.yml b/config/feature_flags/experiment/code_quality_walkthrough.yml
index 0bad0bbb1c0..572a0dc0a9f 100644
--- a/config/feature_flags/experiment/ci_syntax_templates_b_experiment_percentage.yml
+++ b/config/feature_flags/experiment/code_quality_walkthrough.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_syntax_templates_b_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53479
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300993
-milestone: "13.9"
+name: code_quality_walkthrough
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327229
+milestone: "13.12"
 type: experiment
 group: group::activation
 default_enabled: false
diff --git a/config/feature_flags/experiment/in_product_guidance_environments_webide.yml b/config/feature_flags/experiment/in_product_guidance_environments_webide.yml
new file mode 100644
index 00000000000..732294f7d96
--- /dev/null
+++ b/config/feature_flags/experiment/in_product_guidance_environments_webide.yml
@@ -0,0 +1,8 @@
+---
+name: in_product_guidance_environments_webide
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57160
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330390
+milestone: '13.12'
+type: experiment
+group: group::release
+default_enabled: false
diff --git a/config/feature_flags/experiment/invite_members_version_b_experiment_percentage.yml b/config/feature_flags/experiment/invite_signup_page_interaction.yml
index 069e740ba44..660a503fb3a 100644
--- a/config/feature_flags/experiment/invite_members_version_b_experiment_percentage.yml
+++ b/config/feature_flags/experiment/invite_signup_page_interaction.yml
@@ -1,8 +1,8 @@
 ---
-name: invite_members_version_b_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43900
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/214
-milestone: '13.5'
+name: invite_signup_page_interaction
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60939
+rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/379
+milestone: '13.12'
 type: experiment
 group: group::expansion
 default_enabled: false
diff --git a/config/feature_flags/experiment/jobs_to_be_done.yml b/config/feature_flags/experiment/jobs_to_be_done.yml
new file mode 100644
index 00000000000..5589d33a3c3
--- /dev/null
+++ b/config/feature_flags/experiment/jobs_to_be_done.yml
@@ -0,0 +1,8 @@
+---
+name: jobs_to_be_done
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60038
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/285564
+milestone: '13.12'
+type: experiment
+group: group::adoption
+default_enabled: false
diff --git a/config/feature_flags/development/not_issuable_queries.yml b/config/feature_flags/ops/block_issue_repositioning.yml
index e5770d1a2ea..432f9063b8a 100644
--- a/config/feature_flags/development/not_issuable_queries.yml
+++ b/config/feature_flags/ops/block_issue_repositioning.yml
@@ -1,8 +1,8 @@
 ---
-name: not_issuable_queries
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27639
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292809
-milestone: '13.0'
-type: development
+name: block_issue_repositioning
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60141
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329663
+milestone: '13.12'
+type: ops
 group: group::project management
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/ops/block_password_auth_for_saml_users.yml b/config/feature_flags/ops/block_password_auth_for_saml_users.yml
new file mode 100644
index 00000000000..492c00f2dd5
--- /dev/null
+++ b/config/feature_flags/ops/block_password_auth_for_saml_users.yml
@@ -0,0 +1,8 @@
+---
+name: block_password_auth_for_saml_users
+introduced_by_url:
+rollout_issue_url:
+milestone: '13.11'
+type: ops
+group: group::access
+default_enabled: false
diff --git a/config/feature_flags/development/longer_count_cache_validity.yml b/config/feature_flags/ops/cached_route_lookups.yml
index 380eaafac44..3abc9820f37 100644
--- a/config/feature_flags/development/longer_count_cache_validity.yml
+++ b/config/feature_flags/ops/cached_route_lookups.yml
@@ -1,8 +1,8 @@
 ---
-name: longer_count_cache_validity
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57122
-rollout_issue_url: 
+name: cached_route_lookups
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57027
+rollout_issue_url:
 milestone: '13.11'
-type: development
+type: ops
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/ops/ci_queueing_disaster_recovery.yml b/config/feature_flags/ops/ci_queueing_disaster_recovery.yml
new file mode 100644
index 00000000000..8c87df59e08
--- /dev/null
+++ b/config/feature_flags/ops/ci_queueing_disaster_recovery.yml
@@ -0,0 +1,8 @@
+---
+name: ci_queueing_disaster_recovery
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56658
+rollout_issue_url:
+milestone: "13.12"
+type: ops
+group: group::continuous integration
+default_enabled: false
diff --git a/config/feature_flags/ops/execute_batched_migrations_on_schedule.yml b/config/feature_flags/ops/execute_batched_migrations_on_schedule.yml
index f518849b57f..b739099fcd5 100644
--- a/config/feature_flags/ops/execute_batched_migrations_on_schedule.yml
+++ b/config/feature_flags/ops/execute_batched_migrations_on_schedule.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326241
 milestone: '13.11'
 type: ops
 group: group::database
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/ops/optimize_batched_migrations.yml b/config/feature_flags/ops/optimize_batched_migrations.yml
new file mode 100644
index 00000000000..ff36d1338f1
--- /dev/null
+++ b/config/feature_flags/ops/optimize_batched_migrations.yml
@@ -0,0 +1,8 @@
+---
+name: optimize_batched_migrations
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60133
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328817
+milestone: '13.12'
+type: ops
+group: group::database
+default_enabled: true
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index da1a15302da..aee9dd455af 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -438,6 +438,12 @@ production: &base
   ## Sidekiq
   sidekiq:
     log_format: json # (default is the original format)
+    # An array of tuples indicating the rules for re-routing a worker to a
+    # desirable queue before scheduling. For example:
+    # routing_rules:
+    #   - ["resource_boundary=cpu", "cpu_boundary"]
+    #   - ["feature_category=pages", null]
+    #   - ["*", "default"]
 
   ## Auxiliary jobs
   # Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc.
@@ -1264,6 +1270,10 @@ production: &base
     # matomo_site_id: '_your_matomo_site_id'
     # matomo_disable_cookies: false
 
+    ## Maximum file size for syntax highlighting
+    ## https://docs.gitlab.com/ee/user/project/highlighting.html
+    # maximum_text_highlight_size_kilobytes: 512
+
   rack_attack:
     git_basic_auth:
       # Rack Attack IP banning enabled
@@ -1416,7 +1426,7 @@ test:
         gitaly_address: unix:tmp/tests/gitaly/praefect.socket
 
   gitaly:
-    client_path: tmp/tests/gitaly
+    client_path: tmp/tests/gitaly/_build/bin
     token: secret
   workhorse:
     secret_file: tmp/gitlab_workhorse_test_secret
diff --git a/config/helpers/vendor_dll_hash.js b/config/helpers/vendor_dll_hash.js
index cdbaebc9789..9b99b4c4ae9 100644
--- a/config/helpers/vendor_dll_hash.js
+++ b/config/helpers/vendor_dll_hash.js
@@ -1,5 +1,5 @@
-const fs = require('fs');
 const crypto = require('crypto');
+const fs = require('fs');
 const path = require('path');
 
 const CACHE_PATHS = [
diff --git a/config/initializers/01_secret_token.rb b/config/initializers/01_secret_token.rb
index c4520b4b313..c1f03dfdb07 100644
--- a/config/initializers/01_secret_token.rb
+++ b/config/initializers/01_secret_token.rb
@@ -44,7 +44,7 @@ def create_tokens
 
   begin
     File.delete(secret_file) if file_secret_key
-  rescue => e
+  rescue StandardError => e
     warn "Error deleting useless .secret file: #{e}"
   end
 end
diff --git a/config/initializers/0_inject_enterprise_edition_module.rb b/config/initializers/0_inject_enterprise_edition_module.rb
index f9c82f45040..ea3fbda9186 100644
--- a/config/initializers/0_inject_enterprise_edition_module.rb
+++ b/config/initializers/0_inject_enterprise_edition_module.rb
@@ -3,38 +3,36 @@
 require 'active_support/inflector'
 
 module InjectEnterpriseEditionModule
-  def prepend_if_ee(constant, with_descendants: false)
-    return unless Gitlab.ee?
-
-    prepend_module(constant.constantize, with_descendants)
-  end
-
-  def extend_if_ee(constant)
-    extend(constant.constantize) if Gitlab.ee?
+  def prepend_mod_with(constant_name, namespace: Object, with_descendants: false)
+    each_extension_for(constant_name, namespace) do |constant|
+      prepend_module(constant, with_descendants)
+    end
   end
 
-  def include_if_ee(constant)
-    include(constant.constantize) if Gitlab.ee?
+  def extend_mod_with(constant_name, namespace: Object)
+    each_extension_for(
+      constant_name,
+      namespace,
+      &method(:extend))
   end
 
-  def prepend_ee_mod(with_descendants: false)
-    return unless Gitlab.ee?
-
-    prepend_module(ee_module, with_descendants)
+  def include_mod_with(constant_name, namespace: Object)
+    each_extension_for(
+      constant_name,
+      namespace,
+      &method(:include))
   end
 
-  def extend_ee_mod
-    extend(ee_module) if Gitlab.ee?
+  def prepend_mod(with_descendants: false)
+    prepend_mod_with(name, with_descendants: with_descendants) # rubocop: disable Cop/InjectEnterpriseEditionModule
   end
 
-  def include_ee_mod
-    include(ee_module) if Gitlab.ee?
+  def extend_mod
+    extend_mod_with(name) # rubocop: disable Cop/InjectEnterpriseEditionModule
   end
 
-  def prepend_if_jh(constant, with_descendants: false)
-    return unless Gitlab.jh?
-
-    prepend_module(constant.constantize, with_descendants)
+  def include_mod
+    include_mod_with(name) # rubocop: disable Cop/InjectEnterpriseEditionModule
   end
 
   private
@@ -47,8 +45,28 @@ module InjectEnterpriseEditionModule
     end
   end
 
-  def ee_module
-    ::EE.const_get(name, false)
+  def each_extension_for(constant_name, namespace)
+    Gitlab.extensions.each do |extension_name|
+      extension_namespace =
+        const_get_maybe_false(namespace, extension_name.upcase)
+
+      extension_module =
+        const_get_maybe_false(extension_namespace, constant_name)
+
+      yield(extension_module) if extension_module
+    end
+  end
+
+  def const_get_maybe_false(mod, name)
+    # We're still heavily relying on Rails autoloading instead of zeitwerk,
+    # therefore this check: `mod.const_defined?(name, false)`
+    # Is not reliable, which may return false while it's defined.
+    # After we moved everything over to zeitwerk we can avoid rescuing
+    # NameError and just check if const_defined?
+    # mod && mod.const_defined?(name, false) && mod.const_get(name, false)
+    mod && mod.const_get(name, false)
+  rescue NameError
+    false
   end
 end
 
diff --git a/config/initializers/0_license.rb b/config/initializers/0_license.rb
index 3db5ec0a91a..c1a2048b28d 100644
--- a/config/initializers/0_license.rb
+++ b/config/initializers/0_license.rb
@@ -5,7 +5,7 @@ load_license = lambda do |dir:, license_name:|
   public_key_file = File.read(Rails.root.join(dir, ".#{prefix}license_encryption_key.pub"))
   public_key = OpenSSL::PKey::RSA.new(public_key_file)
   Gitlab::License.encryption_key = public_key
-rescue
+rescue StandardError
   warn "WARNING: No valid #{license_name} encryption key provided."
 end
 
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 99335321f28..8d5e19afc20 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -564,11 +564,17 @@ Settings.cron_jobs['ssh_keys_expired_notification_worker'] ||= Settingslogic.new
 Settings.cron_jobs['ssh_keys_expired_notification_worker']['cron'] ||= '0 2 * * *'
 Settings.cron_jobs['ssh_keys_expired_notification_worker']['job_class'] = 'SshKeys::ExpiredNotificationWorker'
 Settings.cron_jobs['namespaces_in_product_marketing_emails_worker'] ||= Settingslogic.new({})
-Settings.cron_jobs['namespaces_in_product_marketing_emails_worker']['cron'] ||= '0 9 * * *'
+Settings.cron_jobs['namespaces_in_product_marketing_emails_worker']['cron'] ||= '0 16 * * *'
 Settings.cron_jobs['namespaces_in_product_marketing_emails_worker']['job_class'] = 'Namespaces::InProductMarketingEmailsWorker'
 Settings.cron_jobs['ssh_keys_expiring_soon_notification_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['ssh_keys_expiring_soon_notification_worker']['cron'] ||= '0 1 * * *'
 Settings.cron_jobs['ssh_keys_expiring_soon_notification_worker']['job_class'] = 'SshKeys::ExpiringSoonNotificationWorker'
+Settings.cron_jobs['users_deactivate_dormant_users_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['users_deactivate_dormant_users_worker']['cron'] ||= '21,42 0-4 * * *'
+Settings.cron_jobs['users_deactivate_dormant_users_worker']['job_class'] = 'Users::DeactivateDormantUsersWorker'
+Settings.cron_jobs['ci_delete_unit_tests_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['ci_delete_unit_tests_worker']['cron'] ||= '0 0 * * *'
+Settings.cron_jobs['ci_delete_unit_tests_worker']['job_class'] = 'Ci::DeleteUnitTestsWorker'
 
 Gitlab.com do
   Settings.cron_jobs['batched_background_migrations_worker'] ||= Settingslogic.new({})
@@ -668,7 +674,7 @@ Gitlab.ee do
   Settings.cron_jobs['elastic_migration_worker']['cron'] ||= '*/30 * * * *'
   Settings.cron_jobs['elastic_migration_worker']['job_class'] ||= 'Elastic::MigrationWorker'
   Settings.cron_jobs['sync_seat_link_worker'] ||= Settingslogic.new({})
-  Settings.cron_jobs['sync_seat_link_worker']['cron'] ||= "#{rand(60)} 0 * * *"
+  Settings.cron_jobs['sync_seat_link_worker']['cron'] ||= "#{rand(60)} 3 * * * UTC"
   Settings.cron_jobs['sync_seat_link_worker']['job_class'] = 'SyncSeatLinkWorker'
   Settings.cron_jobs['web_application_firewall_metrics_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['web_application_firewall_metrics_worker']['cron'] ||= '0 1 * * 0'
@@ -688,6 +694,12 @@ Gitlab.ee do
   Settings.cron_jobs['vulnerability_historical_statistics_deletion_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['vulnerability_historical_statistics_deletion_worker']['cron'] ||= '15 3 * * *'
   Settings.cron_jobs['vulnerability_historical_statistics_deletion_worker']['job_class'] = 'Vulnerabilities::HistoricalStatistics::DeletionWorker'
+  Settings.cron_jobs['security_create_orchestration_policy_worker'] ||= Settingslogic.new({})
+  Settings.cron_jobs['security_create_orchestration_policy_worker']['cron'] ||= '*/10 * * * *'
+  Settings.cron_jobs['security_create_orchestration_policy_worker']['job_class'] = 'Security::CreateOrchestrationPolicyWorker'
+  Settings.cron_jobs['security_orchestration_policy_rule_schedule_worker'] ||= Settingslogic.new({})
+  Settings.cron_jobs['security_orchestration_policy_rule_schedule_worker']['cron'] ||= '*/15 * * * *'
+  Settings.cron_jobs['security_orchestration_policy_rule_schedule_worker']['job_class'] = 'Security::OrchestrationPolicyRuleScheduleWorker'
 end
 
 #
@@ -695,6 +707,7 @@ end
 #
 Settings['sidekiq'] ||= Settingslogic.new({})
 Settings['sidekiq']['log_format'] ||= 'default'
+Settings['sidekiq']['routing_rules'] ||= []
 
 #
 # GitLab Shell
@@ -852,6 +865,7 @@ Settings['extra'] ||= Settingslogic.new({})
 Settings.extra['matomo_site_id'] ||= Settings.extra['piwik_site_id'] if Settings.extra['piwik_site_id'].present?
 Settings.extra['matomo_url'] ||= Settings.extra['piwik_url'] if Settings.extra['piwik_url'].present?
 Settings.extra['matomo_disable_cookies'] = false if Settings.extra['matomo_disable_cookies'].nil?
+Settings.extra['maximum_text_highlight_size_kilobytes'] = Settings.extra.fetch('maximum_text_highlight_size_kilobytes', 512).kilobytes
 
 #
 # Rack::Attack settings
diff --git a/config/initializers/active_record_preloader.rb b/config/initializers/active_record_preloader.rb
index 257a8a9e955..198c97cb849 100644
--- a/config/initializers/active_record_preloader.rb
+++ b/config/initializers/active_record_preloader.rb
@@ -4,7 +4,7 @@ module ActiveRecord
   module Associations
     class Preloader
       class NullPreloader
-        def self.new(klass, owners, reflection, preload_scope)
+        def self.new(*args, **kwargs)
           self
         end
 
diff --git a/config/initializers/active_record_renamed_table.rb b/config/initializers/active_record_renamed_table.rb
new file mode 100644
index 00000000000..948ef8790c8
--- /dev/null
+++ b/config/initializers/active_record_renamed_table.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::ConnectionAdapters::SchemaCache.prepend(Gitlab::Database::SchemaCacheWithRenamedTable)
+end
diff --git a/config/initializers/database_config.rb b/config/initializers/database_config.rb
index a91f67224d7..6637080c038 100644
--- a/config/initializers/database_config.rb
+++ b/config/initializers/database_config.rb
@@ -20,25 +20,15 @@ Gitlab.ee do
   end
 end
 
-# We configure the database connection pool size automatically based on the
-# configured concurrency. We also add some headroom, to make sure we don't run
-# out of connections when more threads besides the 'user-facing' ones are
-# running.
-#
-# Read more about this in doc/development/database/client_side_connection_pool.md
-
-headroom = (ENV["DB_POOL_HEADROOM"].presence || 10).to_i
-calculated_pool_size = Gitlab::Runtime.max_threads + headroom
-
 db_config = Gitlab::Database.config ||
             Rails.application.config.database_configuration[Rails.env]
 
-db_config['pool'] = calculated_pool_size
+db_config['pool'] = Gitlab::Database.default_pool_size
 ActiveRecord::Base.establish_connection(db_config)
 
 Gitlab.ee do
   if Gitlab::Runtime.sidekiq? && Gitlab::Geo.geo_database_configured?
-    Rails.configuration.geo_database['pool'] = calculated_pool_size
+    Rails.configuration.geo_database['pool'] = Gitlab::Database.default_pool_size
     Geo::TrackingBase.establish_connection(Rails.configuration.geo_database)
   end
 end
diff --git a/config/initializers/declarative_policy.rb b/config/initializers/declarative_policy.rb
new file mode 100644
index 00000000000..49267584809
--- /dev/null
+++ b/config/initializers/declarative_policy.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+DeclarativePolicy.configure do
+  named_policy :global, ::GlobalPolicy
+end
diff --git a/config/initializers/geo.rb b/config/initializers/geo.rb
index 3278dc9e484..e0530f43899 100644
--- a/config/initializers/geo.rb
+++ b/config/initializers/geo.rb
@@ -4,6 +4,6 @@ Gitlab.ee do
   if Gitlab::Geo.connected? && Gitlab::Geo.primary?
     Gitlab::Geo.current_node&.update_clone_url!
   end
-rescue => e
+rescue StandardError => e
   warn "WARNING: Unable to check/update clone_url_prefix for Geo: #{e}"
 end
diff --git a/config/initializers/gitlab_workhorse_secret.rb b/config/initializers/gitlab_workhorse_secret.rb
index 5c959a72bd1..88fabe50e83 100644
--- a/config/initializers/gitlab_workhorse_secret.rb
+++ b/config/initializers/gitlab_workhorse_secret.rb
@@ -2,7 +2,7 @@
 
 begin
   Gitlab::Workhorse.secret
-rescue
+rescue StandardError
   Gitlab::Workhorse.write_secret
 end
 
diff --git a/config/initializers/postgres_cte_as_materialized.rb b/config/initializers/postgres_cte_as_materialized.rb
index 85b3361e25e..fd6e7b48c25 100644
--- a/config/initializers/postgres_cte_as_materialized.rb
+++ b/config/initializers/postgres_cte_as_materialized.rb
@@ -6,7 +6,7 @@ module Arel
     class Arel::Visitors::PostgreSQL
       def visit_Gitlab_Database_AsWithMaterialized(obj, collector) # rubocop:disable Naming/MethodName
         collector = visit obj.left, collector
-        collector << " AS#{obj.expr} "
+        collector << " AS "
         visit obj.right, collector
       end
     end
diff --git a/config/initializers/postgres_partitioning.rb b/config/initializers/postgres_partitioning.rb
index 6b64ea3f83d..787e46c2405 100644
--- a/config/initializers/postgres_partitioning.rb
+++ b/config/initializers/postgres_partitioning.rb
@@ -4,7 +4,7 @@
 # (even with eager loading disabled).
 
 Gitlab::Database::Partitioning::PartitionCreator.register(AuditEvent)
-Gitlab::Database::Partitioning::PartitionCreator.register(WebHookLogPartitioned)
+Gitlab::Database::Partitioning::PartitionCreator.register(WebHookLog)
 
 begin
   Gitlab::Database::Partitioning::PartitionCreator.new.create_partitions unless ENV['DISABLE_POSTGRES_PARTITION_CREATION_ON_STARTUP']
diff --git a/config/initializers/puma_client_tempfile_patch.rb b/config/initializers/puma_client_tempfile_patch.rb
index e1faa21804f..972eeaf0c83 100644
--- a/config/initializers/puma_client_tempfile_patch.rb
+++ b/config/initializers/puma_client_tempfile_patch.rb
@@ -1,101 +1,99 @@
 # frozen_string_literal: true
 
 if Gitlab::Runtime.puma?
+  # This patch represents https://github.com/puma/puma/pull/2613. If
+  # this PR is accepted in the next Puma release, we can remove this
+  # entire file.
+  #
+  # The patch itself is quite large because the tempfile creation in
+  # Puma is inside these fairly long methods. The actual changes are
+  # just two lines, commented with 'GitLab' to make them easier to find.
   raise "Remove this monkey patch: #{__FILE__}" unless Puma::Const::VERSION == '5.1.1'
 
-  if ENV['GITLAB_TEMPFILE_IMMEDIATE_UNLINK'] == '1'
-    # This is copied from https://github.com/puma/puma/blob/v5.1.1/lib/puma/client.rb,
-    # with two additions: both times we create a temporary file, we immediately
-    # call `#unlink`. This means that if the process gets terminated without being
-    # able to clean up itself, the temporary file will not linger on the file
-    # system. We will try to get this patch accepted upstream if it works for us
-    # (we just need to check if the temporary file responds to `#unlink` as that
-    # won't work on Windows, for instance).
-    module Puma
-      class Client
-        private
-
-        def setup_body
-          @body_read_start = Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
-
-          if @env[HTTP_EXPECT] == CONTINUE
-            # TODO allow a hook here to check the headers before
-            # going forward
-            @io << HTTP_11_100
-            @io.flush
-          end
+  module Puma
+    class Client
+      private
+
+      def setup_body
+        @body_read_start = Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
 
-          @read_header = false
+        if @env[HTTP_EXPECT] == CONTINUE
+          # TODO allow a hook here to check the headers before
+          # going forward
+          @io << HTTP_11_100
+          @io.flush
+        end
 
-          body = @parser.body
+        @read_header = false
 
-          te = @env[TRANSFER_ENCODING2]
+        body = @parser.body
 
-          if te
-            if te.include?(",")
-              te.split(",").each do |part|
-                if CHUNKED.casecmp(part.strip) == 0 # rubocop:disable Metrics/BlockNesting
-                  return setup_chunked_body(body)
-                end
+        te = @env[TRANSFER_ENCODING2]
+
+        if te
+          if te.include?(",")
+            te.split(",").each do |part|
+              if CHUNKED.casecmp(part.strip) == 0 # rubocop:disable Metrics/BlockNesting
+                return setup_chunked_body(body)
               end
-            elsif CHUNKED.casecmp(te) == 0
-              return setup_chunked_body(body)
             end
+          elsif CHUNKED.casecmp(te) == 0
+            return setup_chunked_body(body)
           end
+        end
 
-          @chunked_body = false
+        @chunked_body = false
 
-          cl = @env[CONTENT_LENGTH]
+        cl = @env[CONTENT_LENGTH]
 
-          unless cl
-            @buffer = body.empty? ? nil : body
-            @body = EmptyBody
-            set_ready
-            return true
-          end
+        unless cl
+          @buffer = body.empty? ? nil : body
+          @body = EmptyBody
+          set_ready
+          return true
+        end
 
-          remain = cl.to_i - body.bytesize
+        remain = cl.to_i - body.bytesize
 
-          if remain <= 0
-            @body = StringIO.new(body)
-            @buffer = nil
-            set_ready
-            return true
-          end
+        if remain <= 0
+          @body = StringIO.new(body)
+          @buffer = nil
+          set_ready
+          return true
+        end
 
-          if remain > MAX_BODY
-            @body = Tempfile.new(Const::PUMA_TMP_BASE)
-            @body.binmode
-            @body.unlink # This is the changed part
-            @tempfile = @body
-          else
-            # The body[0,0] trick is to get an empty string in the same
-            # encoding as body.
-            @body = StringIO.new body[0,0] # rubocop:disable Layout/SpaceAfterComma
-          end
+        if remain > MAX_BODY
+          @body = Tempfile.new(Const::PUMA_TMP_BASE)
+          @body.binmode
+          @body.unlink # GitLab: this is the changed part
+          @tempfile = @body
+        else
+          # The body[0,0] trick is to get an empty string in the same
+          # encoding as body.
+          @body = StringIO.new body[0,0] # rubocop:disable Layout/SpaceAfterComma
+        end
 
-          @body.write body
+        @body.write body
 
-          @body_remain = remain
+        @body_remain = remain
 
-          return false # rubocop:disable Style/RedundantReturn
-        end
+        return false # rubocop:disable Style/RedundantReturn
+      end
 
-        def setup_chunked_body(body)
-          @chunked_body = true
-          @partial_part_left = 0
-          @prev_chunk = ""
+      def setup_chunked_body(body)
+        @chunked_body = true
+        @partial_part_left = 0
+        @prev_chunk = ""
 
-          @body = Tempfile.new(Const::PUMA_TMP_BASE)
-          @body.binmode
-          @body.unlink # This is the changed part
-          @tempfile = @body
-          @chunked_content_length = 0
+        @body = Tempfile.new(Const::PUMA_TMP_BASE)
+        @body.binmode
+        @body.unlink # GitLab: this is the changed part
+        @tempfile = @body
+        @chunked_content_length = 0
 
-          if decode_chunk(body)
-            @env[CONTENT_LENGTH] = @chunked_content_length
-            return true # rubocop:disable Style/RedundantReturn
-          end
+        if decode_chunk(body)
+          @env[CONTENT_LENGTH] = @chunked_content_length
+          return true # rubocop:disable Style/RedundantReturn
         end
       end
     end
diff --git a/config/initializers/request_profiler.rb b/config/initializers/request_profiler.rb
index 8e426772b9a..2eb9f53d2a3 100644
--- a/config/initializers/request_profiler.rb
+++ b/config/initializers/request_profiler.rb
@@ -2,4 +2,5 @@
 
 Rails.application.configure do |config|
   config.middleware.use(Gitlab::RequestProfiler::Middleware)
+  config.middleware.use(Gitlab::Middleware::Speedscope)
 end
diff --git a/config/initializers/rspec_profiling.rb b/config/initializers/rspec_profiling.rb
index 2473dc1ff6c..1288fad8a94 100644
--- a/config/initializers/rspec_profiling.rb
+++ b/config/initializers/rspec_profiling.rb
@@ -43,7 +43,7 @@ module RspecProfilingExt
   module Run
     def example_finished(*args)
       super
-    rescue => err
+    rescue StandardError => err
       return if @already_logged_example_finished_error # rubocop:disable Gitlab/ModuleWithInstanceVariables
 
       warn "rspec_profiling couldn't collect an example: #{err}. Further warnings suppressed."
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 6e0cd33aa96..530d7342d57 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -7,7 +7,7 @@ require 'gitlab/current_settings'
 # allow it to fail: it may do so when create_from_defaults is executed before migrations are actually done
 begin
   Settings.gitlab['session_expire_delay'] = Gitlab::CurrentSettings.current_application_settings.session_expire_delay || 10080
-rescue
+rescue StandardError
   Settings.gitlab['session_expire_delay'] ||= 10080
 end
 
diff --git a/config/initializers/stackprof.rb b/config/initializers/stackprof.rb
index 4c4d241f065..4ff219cfda1 100644
--- a/config/initializers/stackprof.rb
+++ b/config/initializers/stackprof.rb
@@ -1,140 +1,5 @@
 # frozen_string_literal: true
 
-# trigger stackprof by sending a SIGUSR2 signal
-#
-# Docs: https://docs.gitlab.com/ee/development/performance.html#production
-
-module Gitlab
-  class StackProf
-    DEFAULT_FILE_PREFIX = Dir.tmpdir
-    DEFAULT_TIMEOUT_SEC = 30
-    DEFAULT_MODE = :cpu
-    # Sample interval as a frequency in microseconds (~100hz); appropriate for CPU profiles
-    DEFAULT_INTERVAL_US = 10_000
-    # Sample interval in event occurrences (n = every nth event); appropriate for allocation profiles
-    DEFAULT_INTERVAL_EVENTS = 1_000
-
-    # this is a workaround for sidekiq, which defines its own SIGUSR2 handler.
-    # by defering to the sidekiq startup event, we get to set up our own
-    # handler late enough.
-    # see also: https://github.com/mperham/sidekiq/pull/4653
-    def self.install
-      require 'stackprof'
-      require 'tmpdir'
-
-      if Gitlab::Runtime.sidekiq?
-        Sidekiq.configure_server do |config|
-          config.on :startup do
-            on_worker_start
-          end
-        end
-      else
-        Gitlab::Cluster::LifecycleEvents.on_worker_start do
-          on_worker_start
-        end
-      end
-    end
-
-    def self.on_worker_start
-      log_event('listening for SIGUSR2 signal')
-
-      # create a pipe in order to propagate signal out of the signal handler
-      # see also: https://cr.yp.to/docs/selfpipe.html
-      read, write = IO.pipe
-
-      # create a separate thread that polls for signals on the pipe.
-      #
-      # this way we do not execute in signal handler context, which
-      # lifts restrictions and also serializes the calls in a thread-safe
-      # manner.
-      #
-      # it's very similar to a goroutine and channel design.
-      #
-      # another nice benefit of this method is that we can timeout the
-      # IO.select call, allowing the profile to automatically stop after
-      # a given interval (by default 30 seconds), avoiding unbounded memory
-      # growth from a profile that was started and never stopped.
-      t = Thread.new do
-        timeout_s = ENV['STACKPROF_TIMEOUT_S']&.to_i || DEFAULT_TIMEOUT_SEC
-        current_timeout_s = nil
-        loop do
-          read.getbyte if IO.select([read], nil, nil, current_timeout_s)
-
-          if ::StackProf.running?
-            stackprof_file_prefix = ENV['STACKPROF_FILE_PREFIX'] || DEFAULT_FILE_PREFIX
-            stackprof_out_file = "#{stackprof_file_prefix}/stackprof.#{Process.pid}.#{SecureRandom.hex(6)}.profile"
-
-            log_event(
-              'stopping profile',
-              profile_filename: stackprof_out_file,
-              profile_timeout_s: timeout_s
-            )
-
-            ::StackProf.stop
-            ::StackProf.results(stackprof_out_file)
-            current_timeout_s = nil
-          else
-            mode = ENV['STACKPROF_MODE']&.to_sym || DEFAULT_MODE
-            interval = ENV['STACKPROF_INTERVAL']&.to_i
-            interval ||= (mode == :object ? DEFAULT_INTERVAL_EVENTS : DEFAULT_INTERVAL_US)
-
-            log_event(
-              'starting profile',
-              profile_mode: mode,
-              profile_interval: interval,
-              profile_timeout: timeout_s
-            )
-
-            ::StackProf.start(
-              mode: mode,
-              raw: Gitlab::Utils.to_boolean(ENV['STACKPROF_RAW'] || 'true'),
-              interval: interval
-            )
-            current_timeout_s = timeout_s
-          end
-        end
-      rescue => e
-        log_event("stackprof failed: #{e}")
-      end
-      t.abort_on_exception = true
-
-      # in the case of puma, this will override the existing SIGUSR2 signal handler
-      # that can be used to trigger a restart.
-      #
-      # puma cluster has two types of restarts:
-      # * SIGUSR1: phased restart
-      # * SIGUSR2: restart
-      #
-      # phased restart is not supported in our configuration, because we use
-      # preload_app. this means we will always perform a normal restart.
-      # additionally, phased restart is not supported when sending a SIGUSR2
-      # directly to a puma worker (as opposed to the master process).
-      #
-      # the result is that the behaviour of SIGUSR1 and SIGUSR2 is identical in
-      # our configuration, and we can always use a SIGUSR1 to perform a restart.
-      #
-      # thus, it is acceptable for us to re-appropriate the SIGUSR2 signal, and
-      # override the puma behaviour.
-      #
-      # see also:
-      # * https://github.com/puma/puma/blob/master/docs/signals.md#puma-signals
-      # * https://github.com/phusion/unicorn/blob/master/SIGNALS
-      # * https://github.com/mperham/sidekiq/wiki/Signals
-      Signal.trap('SIGUSR2') do
-        write.write('.')
-      end
-    end
-
-    def self.log_event(event, labels = {})
-      Gitlab::AppJsonLogger.info({
-        event: 'stackprof',
-        message: event,
-        pid: Process.pid
-      }.merge(labels.compact))
-    end
-  end
-end
-
 if Gitlab::Utils.to_boolean(ENV['STACKPROF_ENABLED'].to_s)
   Gitlab::StackProf.install
 end
diff --git a/config/initializers_before_autoloader/002_sidekiq.rb b/config/initializers_before_autoloader/002_sidekiq.rb
index 4ce9127a45d..8e2def08279 100644
--- a/config/initializers_before_autoloader/002_sidekiq.rb
+++ b/config/initializers_before_autoloader/002_sidekiq.rb
@@ -12,9 +12,6 @@ require 'sidekiq/web'
 # CSRF protection still works (https://github.com/mperham/sidekiq/commit/315504e766c4fd88a29b7772169060afc4c40329).
 Sidekiq::Web.set :sessions, false
 
-# Default is to retry 25 times with exponential backoff. That's too much.
-Sidekiq.default_worker_options = { retry: 3 }
-
 if Rails.env.development?
   Sidekiq.default_worker_options[:backtrace] = true
 end
diff --git a/config/karma.config.js b/config/karma.config.js
index 1c2dd21c189..3e125759357 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -1,8 +1,8 @@
 /* eslint-disable no-inner-declarations, no-param-reassign */
+const path = require('path');
 const chalk = require('chalk');
 const argumentsParser = require('commander');
 const glob = require('glob');
-const path = require('path');
 const webpack = require('webpack');
 const IS_EE = require('./helpers/is_ee_env');
 const webpackConfig = require('./webpack.config.js');
diff --git a/config/known_invalid_graphql_queries.yml b/config/known_invalid_graphql_queries.yml
index 3c6ef13dd1c..7b87edd1da0 100644
--- a/config/known_invalid_graphql_queries.yml
+++ b/config/known_invalid_graphql_queries.yml
@@ -4,6 +4,4 @@ filenames:
   - ee/app/assets/javascripts/security_configuration/api_fuzzing/graphql/api_fuzzing_ci_configuration.query.graphql
   - ee/app/assets/javascripts/security_configuration/api_fuzzing/graphql/create_api_fuzzing_configuration.mutation.graphql
   - ee/app/assets/javascripts/security_configuration/dast_profiles/graphql/dast_failed_site_validations.query.graphql
-  - app/assets/javascripts/repository/queries/blob_info.query.graphql
   - ee/app/assets/javascripts/security_configuration/graphql/configure_dependency_scanning.mutation.graphql
-  - ee/app/assets/javascripts/security_configuration/graphql/configure_secret_detection.mutation.graphql
diff --git a/config/metrics/aggregates/code_review.yml b/config/metrics/aggregates/code_review.yml
index a2e931bd217..e1f30777612 100644
--- a/config/metrics/aggregates/code_review.yml
+++ b/config/metrics/aggregates/code_review.yml
@@ -52,6 +52,17 @@
     - 'i_code_review_user_reviewers_changed'
     - 'i_code_review_user_milestone_changed'
     - 'i_code_review_user_labels_changed'
+    - 'i_code_review_click_single_file_mode_setting'
+    - 'i_code_review_click_file_browser_setting'
+    - 'i_code_review_click_whitespace_setting'
+    - 'i_code_review_diff_view_inline'
+    - 'i_code_review_diff_view_parallel'
+    - 'i_code_review_file_browser_tree_view'
+    - 'i_code_review_file_browser_list_view'
+    - 'i_code_review_diff_show_whitespace'
+    - 'i_code_review_diff_hide_whitespace'
+    - 'i_code_review_diff_single_file'
+    - 'i_code_review_diff_multiple_files'
 - name: code_review_category_monthly_active_users
   operator: OR
   feature_flag: usage_data_code_review_aggregation
@@ -96,6 +107,17 @@
     - 'i_code_review_user_reviewers_changed'
     - 'i_code_review_user_milestone_changed'
     - 'i_code_review_user_labels_changed'
+    - 'i_code_review_click_single_file_mode_setting'
+    - 'i_code_review_click_file_browser_setting'
+    - 'i_code_review_click_whitespace_setting'
+    - 'i_code_review_diff_view_inline'
+    - 'i_code_review_diff_view_parallel'
+    - 'i_code_review_file_browser_tree_view'
+    - 'i_code_review_file_browser_list_view'
+    - 'i_code_review_diff_show_whitespace'
+    - 'i_code_review_diff_hide_whitespace'
+    - 'i_code_review_diff_single_file'
+    - 'i_code_review_diff_multiple_files'
 - name: code_review_extension_category_monthly_active_users
   operator: OR
   feature_flag: usage_data_code_review_aggregation
diff --git a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
index d589814b7af..c5a0a2eebcd 100644
--- a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
@@ -1,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.analytics_unique_visits_for_any_target_monthly
-description: Visits to any of the pages listed above per month
+description: Unique visitors to any analytics feature by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml b/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
deleted file mode 100644
index ea3094527db..00000000000
--- a/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.g_analytics_contribution_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml b/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
deleted file mode 100644
index cb792aae308..00000000000
--- a/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.g_analytics_insights_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml b/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
deleted file mode 100644
index 9fc7894d399..00000000000
--- a/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.g_analytics_issues_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml b/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
deleted file mode 100644
index 2ae3c3626d1..00000000000
--- a/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.g_analytics_productivity_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml b/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
deleted file mode 100644
index 86d84193265..00000000000
--- a/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.g_analytics_valuestream_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
index ba5c4d27d25..72a1f5a2faa 100644
--- a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
@@ -1,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.p_analytics_pipelines_monthly
-description:
+description: Unique visitors to /groups/:group/-/analytics/ci_cd by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml b/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
deleted file mode 100644
index e4c15360b52..00000000000
--- a/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.p_analytics_code_reviews_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
index da07cbee741..7bd0a5ae025 100644
--- a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
+++ b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
@@ -1,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.p_analytics_valuestream_monthly
-description:
+description: Unique visitors to /:group/:project/-/value_stream_analytics by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml b/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
deleted file mode 100644
index afe6c79e885..00000000000
--- a/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.p_analytics_insights_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml b/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
deleted file mode 100644
index 4ee8afd234b..00000000000
--- a/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.p_analytics_issues_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml b/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
deleted file mode 100644
index c41b84dbcd0..00000000000
--- a/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.p_analytics_repo_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
index 843d3717ba7..dc0d7f35622 100644
--- a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
+++ b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
@@ -1,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.i_analytics_cohorts_monthly
 description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
+product_section: fulfillment
+product_stage: fulfillment
+product_group: group::utilization
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
index 77b6068fb8d..ae43df148e5 100644
--- a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
+++ b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
@@ -1,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.i_analytics_dev_ops_score_monthly
-description:
+description: Unique visitors to /admin/dev_ops_report by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
index d7af387f862..c0fd0561ee4 100644
--- a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
@@ -3,14 +3,14 @@ key_path: redis_hll_counters.analytics.g_analytics_merge_request_monthly
 description:
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
-status: data_available
+status: removed
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
+skip_validation: true
\ No newline at end of file
diff --git a/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml b/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
deleted file mode 100644
index f3f7da5ee38..00000000000
--- a/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.p_analytics_merge_request_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
index d7071bf4a79..d9011ddf00b 100644
--- a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
+++ b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
@@ -1,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.i_analytics_instance_statistics_monthly
-description:
+description: Unique visitors to /admin/usage_trends by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
index d173a922f5d..3ce4cbc6e95 100644
--- a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
@@ -1,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.analytics_total_unique_counts_monthly
-description:
+description: The number of unique users who visited any analytics feature by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216175055_merge_requests.yml b/config/metrics/counts_28d/20210216175055_merge_requests.yml
index 048ea4fd917..bb1f64177a1 100644
--- a/config/metrics/counts_28d/20210216175055_merge_requests.yml
+++ b/config/metrics/counts_28d/20210216175055_merge_requests.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.merge_requests
-description:
+description: Count of the number of users creating merge requests
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -8,9 +8,11 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
index 7e9186a3a82..2db67a4028c 100644
--- a/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -1,17 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.projects_with_disable_overriding_approvers_per_merge_request
-description:
+description: Count of the number of projects with setting to disable overriding approvers per merge request
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
index 56107e921f2..152c248802a 100644
--- a/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -1,17 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.projects_without_disable_overriding_approvers_per_merge_request
-description:
+description: Count of the number of projects without setting to disable overriding approvers per merge request
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
index 563a56c2a0f..3df6f0f080a 100644
--- a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
+++ b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.merge_requests_users
-description:
+description: Monthly count of the number of merge request users
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -8,9 +8,11 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175109_suggestions.yml b/config/metrics/counts_28d/20210216175109_suggestions.yml
index 74e388fd07d..b3f019c59bc 100644
--- a/config/metrics/counts_28d/20210216175109_suggestions.yml
+++ b/config/metrics/counts_28d/20210216175109_suggestions.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.suggestions
-description:
+description: Count of unique users per month who create suggestions in merge request comments
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -8,9 +8,11 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
index de3049f76fa..212b59a0dd6 100644
--- a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.source_code.merge_request_action_monthly
-description:
+description: Count of unique users who perform an action on a merge request
 product_section: dev
 product_stage: create
 product_group: group::code review
-product_category:
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml b/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
index 4f409dbf8c5..c8d0d7eb575 100644
--- a/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
+++ b/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.source_code.i_source_code_code_intelligence_monthly
-description:
+description: Count of unique users who use code intelligence
 product_section: dev
 product_stage: create
-product_group: group::code review
-product_category:
+product_group: group::source code
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml b/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
index a23aed69c72..1c4b558288a 100644
--- a/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_mr_diffs_monthly
-description: Count of unique merge requests per week|month with diffs viewed
+description: Count of unique merge requests per month with diffs viewed
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml b/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
index dd315b5634d..d5fded16ee2 100644
--- a/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_single_file_diffs_monthly
-description: Count of unique users per week|month with diffs viewed file by file
+description: Count of unique users per month with diffs viewed file by file
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml b/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
index 82d1c86d146..eb566473b3a 100644
--- a/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_mr_single_file_diffs_monthly
-description: Count of unique merge requests per week|month with diffs viewed file
+description: Count of unique merge requests per month with diffs viewed file
   by file
 product_section: dev
 product_stage: create
@@ -12,6 +12,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
index 28d4477c037..eb95ff294d8 100644
--- a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_monthly
-description: Count of unique users per week|month who created a MR
+description: Count of unique users per month who created a MR
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml b/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
index c73a5da2585..de9d81070e8 100644
--- a/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_close_mr_monthly
-description: Count of unique users per week|month who closed a MR
+description: Count of unique users per month who closed a MR
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml b/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
index 173ff6a995e..0d954358bbe 100644
--- a/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_reopen_mr_monthly
-description: Count of unique users per week|month who reopened a MR
+description: Count of unique users per month who reopened a MR
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml b/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
index 0c126afeb64..bdbd0346dbd 100644
--- a/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_merge_mr_monthly
-description: Count of unique users per week|month who merged a MR
+description: Count of unique users per month who merged a MR
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
index 1c3801e77bc..bf58a8632b8 100644
--- a/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_comment_monthly
-description: Count of unique users per week|month who commented on a MR
+description: Count of unique users per month who commented on a MR
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
index 5a0bf9346a0..045dbba58b7 100644
--- a/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_edit_mr_comment_monthly
-description: Count of unique users per week|month who edited a comment on a MR
+description: Count of unique users per month who edited a comment on a MR
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
index 9e8f191d7e5..5cd5e005262 100644
--- a/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_remove_mr_comment_monthly
-description: Count of unique users per week|month who removed a comment on a MR
+description: Count of unique users per month who removed a comment on a MR
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml b/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
index 9b3c359b6f0..7ebf2072406 100644
--- a/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
+++ b/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml b/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
index be38418982d..548dddda36f 100644
--- a/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
+++ b/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
index 5310c4db557..357ca87eac4 100644
--- a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
+++ b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
@@ -1,6 +1,7 @@
 ---
 key_path: usage_activity_by_stage_monthly.configure.clusters_management_project
-description: Total GitLab Managed clusters with defined cluster management project
+name: "count_distinct_user_id_from_management_project_clusters"
+description: Number of Kubernetes clusters with clusters management project being set
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -8,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -16,5 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.management_project_id IS NOT NULL)'>_clusters"
diff --git a/config/metrics/counts_28d/20210216175542_ci_builds.yml b/config/metrics/counts_28d/20210216175542_ci_builds.yml
index 016d6c75cce..0f3d384937c 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.verify.ci_builds
-description: Unique builds in project
+description: Unique monthly builds in project
 product_section: ops
 product_stage: verify
 product_group: group::continuous integration
@@ -8,9 +8,12 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+
diff --git a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
index f67fb96b9ee..bc0a2051097 100644
--- a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.verify.ci_external_pipelines
-description: Total pipelines in external repositories
+description: Total pipelines in external repositories in a month
 product_section: ops
 product_stage: verify
 product_group: group::continuous integration
@@ -8,9 +8,12 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+
diff --git a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
index 66456d42ffe..d04419aebfc 100644
--- a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.verify.ci_internal_pipelines
-description: Total pipelines in GitLab repositories
+description: Total pipelines in GitLab repositories in a month
 product_section: ops
 product_stage: verify
 product_group: group::continuous integration
@@ -8,9 +8,11 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
index 7720ca5d26a..7cfbe4df320 100644
--- a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
@@ -2,15 +2,17 @@
 key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_config_auto_devops
 description: Total pipelines from an Auto DevOps template
 product_section: ops
-product_stage: verify
-product_group: group::continuous integration
-product_category: continuous_integration
+product_stage: configure
+product_group: group::configure
+product_category: auto_devops
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
index 8c125a51f89..c89d4804607 100644
--- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_config_repository
-description: Total Pipelines from templates in repository
+description: Total Monthly Pipelines from templates in repository
 product_section: ops
 product_stage: verify
 product_group: group::continuous integration
@@ -8,9 +8,11 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
index 7464f28fc68..cfea6f49eb5 100644
--- a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_schedules
-description: Pipeline schedules in GitLab
+description: Total monthly Pipeline schedules in GitLab
 product_section: ops
 product_stage: verify
 product_group: group::continuous integration
@@ -8,9 +8,11 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
index b818e52ecb5..55b0250bbbd 100644
--- a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.verify.ci_pipelines
-description: " Distinct users triggering pipelines in a month"
+description:  "Distinct users triggering pipelines in a month"
 product_section: ops
 product_stage: verify
 product_group: group::continuous integration
@@ -8,10 +8,12 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+- free
diff --git a/config/metrics/counts_28d/20210216175556_ci_triggers.yml b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
index f409434feb0..7a06e45b4e4 100644
--- a/config/metrics/counts_28d/20210216175556_ci_triggers.yml
+++ b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
@@ -8,7 +8,7 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
index 754da9e0006..b3a4a9e384d 100644
--- a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
@@ -8,9 +8,11 @@ product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216180956_clusters.yml b/config/metrics/counts_28d/20210216180956_clusters.yml
index eb5d60f8a61..c33a588fed8 100644
--- a/config/metrics/counts_28d/20210216180956_clusters.yml
+++ b/config/metrics/counts_28d/20210216180956_clusters.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.monitor.clusters
-description: Total GitLab Managed clusters both enabled and disabled
+description: Count users creating clusters in last 28 days.
 product_section: ops
 product_stage:
 product_group: group::monitor
@@ -8,9 +8,11 @@ product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
index 97fb359c657..5f2a94cc3ea 100644
--- a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.monitor.clusters_applications_prometheus
-description: Total GitLab Managed clusters with Prometheus enabled
+description: Users creating clusters with Prometheus enabled in last 28 days.
 product_section: ops
 product_stage:
 product_group: group::monitor
@@ -8,9 +8,11 @@ product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
index 96d737d9d14..28391dfb558 100644
--- a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
@@ -4,13 +4,15 @@ description: Active users with enabled operations dashboard
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
index 6a559c1460f..b934fa26cd4 100644
--- a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
@@ -4,13 +4,15 @@ description: Projects with tracing enabled
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: tracing
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml b/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
index caba12d3d44..2872838e54a 100644
--- a/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.monitor.projects_with_error_tracking_enabled
-description:
+description: Count of users creating projects with error tracking enabled.
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
index 2533117f03b..4ef89c2b47d 100644
--- a/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
@@ -4,13 +4,15 @@ description: Active users with projects on operations dashboard
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216181139_issues.yml b/config/metrics/counts_28d/20210216181139_issues.yml
index 46494caaff7..c6c73e11746 100644
--- a/config/metrics/counts_28d/20210216181139_issues.yml
+++ b/config/metrics/counts_28d/20210216181139_issues.yml
@@ -1,18 +1,19 @@
 ---
 key_path: usage_activity_by_stage_monthly.plan.issues
-description: Count of MAU creating issues
+description: Count of users creating Issues in last 28 days.
 product_section: dev
-product_stage: plan 
+product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
+instrumentation_class: CountUsersCreatingIssuesMetric
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
diff --git a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
index b1009642dcc..e828cefc644 100644
--- a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
+++ b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
@@ -9,9 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: CountUsersUsingApproveQuickActionMetric
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml b/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml
deleted file mode 100644
index c05835b2100..00000000000
--- a/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.release.projects_mirrored_with_pipelines_enabled
-description: Projects with repository mirroring enabled
-product_section: ops
-product_stage:
-product_group: group::release
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182034_deploy_keys.yml b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
index 80f50c7d1a5..0f5a6b3c03d 100644
--- a/config/metrics/counts_28d/20210216182034_deploy_keys.yml
+++ b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.deploy_keys
-description:
+description: Count of users creating deploy keys in last 28 days.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182036_keys.yml b/config/metrics/counts_28d/20210216182036_keys.yml
index d1299065115..eb82cc1f0e6 100644
--- a/config/metrics/counts_28d/20210216182036_keys.yml
+++ b/config/metrics/counts_28d/20210216182036_keys.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.keys
-description:
+description: Count of users creating regular keys in last 28 days.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
index 6b42f18e664..bb64dcb32ca 100644
--- a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
+++ b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.remote_mirrors
-description:
+description: Count of users creating projects with remote mirrors. Includes both push and pull mirrors.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 c75efaf0a80..f1f00fe59e3 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
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_project_repo
-description:
+description: Count of monthly active users who have performed any Git operation (read/write/push)
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 25405624b03..de369a47ffb 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
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_git_write
-description: Aggregated value for wiki, design and project repo actions
+description: Aggregated value for wiki, design, and project repo Git write actions
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml b/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
deleted file mode 100644
index dfacce63f05..00000000000
--- a/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.projects_with_sectional_code_owner_rules
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml b/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
deleted file mode 100644
index d87b910d239..00000000000
--- a/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.projects_with_repositories_enabled
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182051_protected_branches.yml b/config/metrics/counts_28d/20210216182051_protected_branches.yml
index 81d23653307..83c923c173e 100644
--- a/config/metrics/counts_28d/20210216182051_protected_branches.yml
+++ b/config/metrics/counts_28d/20210216182051_protected_branches.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.protected_branches
-description:
+description: Count of users creating projects with repositories making use of at least one protected branch in last 28 days.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
index af59d1a1235..527cc42df22 100644
--- a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.source_code.wiki_action_monthly
-description:
+description: Count of unique actions done on a wiki (create, edit, delete)
 product_section: dev
 product_stage: create
 product_group: group::source code
-product_category:
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
index 8feb369d0fa..971e3defe25 100644
--- a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.source_code.design_action_monthly
-description:
+description: Count of total design actions (upload, delete, comment, reply)
 product_section: dev
 product_stage: create
 product_group: group::source code
-product_category:
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
index 6047e6b6059..d60ec7f438b 100644
--- a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.source_code.project_action_monthly
-description:
+description: Count of unique actions done on projects and related resources (create, edit, delete, comment)
 product_section: dev
 product_stage: create
 product_group: group::source code
-product_category:
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
index a9049c00aa5..b5ba1f7d66b 100644
--- a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
+++ b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts_monthly.projects_with_alerts_created
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Monthly count of unique projects with HTTP alerting enabled
+product_section: ops
+product_stage:
+product_group: group::monitor
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml b/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
deleted file mode 100644
index e3980a944c6..00000000000
--- a/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.total_number_of_path_locks
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml b/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
deleted file mode 100644
index 3808a2f2dcb..00000000000
--- a/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.total_number_of_locked_files
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml b/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml
deleted file mode 100644
index 85ea922568e..00000000000
--- a/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.approval_project_rules_with_more_approvers_than_required
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml b/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml
deleted file mode 100644
index 36a3dccbc95..00000000000
--- a/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.approval_project_rules_with_less_approvers_than_required
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml b/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml
deleted file mode 100644
index a4f7695c505..00000000000
--- a/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.approval_project_rules_with_exact_required_approvers
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183753_projects_incident_sla_enabled.yml b/config/metrics/counts_28d/20210216183753_projects_incident_sla_enabled.yml
deleted file mode 100644
index 660a1b1583b..00000000000
--- a/config/metrics/counts_28d/20210216183753_projects_incident_sla_enabled.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.monitor.projects_incident_sla_enabled
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
index eb0ffa26d2a..e0c301b5c03 100644
--- a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.source_code.git_write_action_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique Git write actions
+product_section: dev
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml b/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml
deleted file mode 100644
index 124f322132f..00000000000
--- a/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.ci_secrets_management.i_ci_secrets_management_vault_build_created_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
index 7d981f850e2..915c5e69fba 100644
--- a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
+++ b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.terraform.p_terraform_state_api_unique_users_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Monthly active users of GitLab Managed Terraform states
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
index 12d7e8ab749..b562a0c63d5 100644
--- a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
+++ b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_toggled_task_item_status_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who toggled a task item in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
index 1df3325b027..cb0062c55a3 100644
--- a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_approve_mr_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who approve a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
index 527105a58fe..ce32c3ac89b 100644
--- a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_unapprove_mr_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who unapprove a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
index cdf2d1135aa..b1c33edd117 100644
--- a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_resolve_thread_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who resolve a thread in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
index d4a27feb8f3..4200abff4fc 100644
--- a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_unresolve_thread_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who unresolve a thread in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
index 27899299abb..8cca5731801 100644
--- a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_edit_mr_title_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who edit the title of a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
index ad564e57ab7..6fcc94e5337 100644
--- a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
+++ b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_edit_mr_desc_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who edit the description of a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
index 10c13e8796f..5a11b327699 100644
--- a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
+++ b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_create_review_note_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who create a note as part of a merge request review
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
index a6bac39ace0..3b8df2a615b 100644
--- a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_publish_review_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who publish their review as part of a merge request review
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
index 937e17e3daf..717476547a8 100644
--- a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_create_multiline_mr_comment_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who create a multiline comment in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
index c88078ffa2b..8d797856907 100644
--- a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_edit_multiline_mr_comment_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per week who edit a multiline comment in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
index 1bd3172b9f6..867e6333c10 100644
--- a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_remove_multiline_mr_comment_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who remove a multiline comment in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
index 594393e33d6..7c2545bd383 100644
--- a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_assigned_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who are assigned to a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
index 8bbaa0dc420..dd79d196318 100644
--- a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_marked_as_draft_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who mark a merge request as a draft
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
index f294f887c99..42285f42ac4 100644
--- a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_unmarked_as_draft_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who unmark a merge request as a draft
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
index d3c4647abbb..664dfb2c36d 100644
--- a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
+++ b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_review_requested_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who request a review of a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
index afbf5e0f3f5..735f3f23d67 100644
--- a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_added_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who add an approval rule to a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
index 565e1346a62..e32c033f22f 100644
--- a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
+++ b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_deleted_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who delete an approval rule to a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
index c21e94ab4ab..ca8baf5a5a4 100644
--- a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_edited_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who delete an approval rule to a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
index c1f06831606..d5cf11af2a5 100644
--- a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_vs_code_api_request_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who use GitLab Workflow for VS Code
+product_stage: create
+product_group: group::code review
+product_category: editor_extension
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
index a985393fa6b..b8ed6e7b1cd 100644
--- a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_from_issue_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who create a merge request from an issue
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
index 72590d59bd1..8881a5a7508 100644
--- a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.code_review_total_unique_counts_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who interact with a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
index e5931e25cdd..53ecb748e05 100644
--- a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines with implicit Auto DevOps runs
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
index 7d52a2807e6..eb9df486c8c 100644
--- a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_build_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines with implicit Auto Build runs
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
index 1f753124f46..dba5b22c3d9 100644
--- a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_deploy_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines with implicit Auto Deploy runs
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
index 62ee737153d..5e1b1c837b0 100644
--- a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
+++ b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of projects using 5 min production app CI template in last 7 days.
+product_section: seg
+product_stage: deploy
+product_group: "group::5-min-app"
+product_category: five_minute_production_app
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
index 55f938dfce1..982c62a62f6 100644
--- a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines using the Auto DevOps template
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
index 0f94788b355..3e00fd8c784 100644
--- a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_cf_deploy_ec2_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: "Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.yml` template in last 28 days."
+product_section: ops
+product_stage: release
+product_group: "group::release"
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
index 2483245b23d..ef6b254a6b4 100644
--- a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_deploy_ecs_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: "Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in last 28 days."
+product_section: ops
+product_stage: release
+product_group: "group::release"
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
index 7ce990172df..3b272166ed8 100644
--- a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_build_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines using the Auto Build template
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
index a585ef5fbb9..2c66fbbd95f 100644
--- a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines using the stable Auto Deploy template
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
index 2e5b87677e1..d7ba2da5d9f 100644
--- a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_latest_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines using the latest Auto Deploy template
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
index fac0fa40406..866ec122f28 100644
--- a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_base_latest_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines that include the terraform base template from GitLab
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml b/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
new file mode 100644
index 00000000000..00ddefe4901
--- /dev/null
+++ b/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.i_package_terraform_module_deploy_token_monthly
+description: Number of distinct users authorized via deploy token creating Terraform Module packages in recent 28 days
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
+time_frame: 28d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml b/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
new file mode 100644
index 00000000000..75accebea99
--- /dev/null
+++ b/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.user_packages.i_package_terraform_module_user_monthly
+description: Number of distinct users creating Terraform Module packages in recent 28 days
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
+time_frame: 28d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml b/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
new file mode 100644
index 00000000000..2bcd2a448ec
--- /dev/null
+++ b/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_click_single_file_mode_setting_monthly
+description: Count of users clicking single file mode setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml b/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
new file mode 100644
index 00000000000..3b7c5be9b84
--- /dev/null
+++ b/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_click_file_browser_setting_monthly
+description: Count of users clicking merge request file browser setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml b/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
new file mode 100644
index 00000000000..31fe497fe0e
--- /dev/null
+++ b/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_click_whitespace_setting_monthly
+description: Count of users clicking merge request whitespae setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml b/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
new file mode 100644
index 00000000000..821f7244209
--- /dev/null
+++ b/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_view_inline_monthly
+description: Count of users with merge request view type as inline
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml b/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
new file mode 100644
index 00000000000..04ff06143af
--- /dev/null
+++ b/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_view_parallel_monthly
+description: Count of users with merge request view type as parallel
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml b/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
new file mode 100644
index 00000000000..ad5b5e835c1
--- /dev/null
+++ b/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_file_browser_tree_view_monthly
+description: Count of users with merge request file tree setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml b/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
new file mode 100644
index 00000000000..c71bacd6004
--- /dev/null
+++ b/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_file_browser_list_view_monthly
+description: Count of users with merge request file list setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml b/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
new file mode 100644
index 00000000000..0d17fa0d965
--- /dev/null
+++ b/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_show_whitespace_monthly
+description: Count of users with show whitespace enabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml b/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
new file mode 100644
index 00000000000..6038bb5cda8
--- /dev/null
+++ b/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_hide_whitespace_monthly
+description: Count of users with show whitespace disabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml b/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
new file mode 100644
index 00000000000..3cfcdf23a47
--- /dev/null
+++ b/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_single_file_monthly
+description: Count of users with single file mode enabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml b/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
new file mode 100644
index 00000000000..16784a0c408
--- /dev/null
+++ b/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_multiple_files_monthly
+description: Count of users with single mode disabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
new file mode 100644
index 00000000000..224fd6477cc
--- /dev/null
+++ b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts_monthly.aggregated_metrics.code_review_category_monthly_active_users
+name: "0"
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 28d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
new file mode 100644
index 00000000000..ba872d725df
--- /dev/null
+++ b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts_monthly.aggregated_metrics.code_review_extension_category_monthly_active_users
+name: "0"
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 28d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
new file mode 100644
index 00000000000..e0e6bb0567d
--- /dev/null
+++ b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts_monthly.aggregated_metrics.code_review_group_monthly_active_users
+name: "0"
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 28d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
new file mode 100644
index 00000000000..594df7ebe26
--- /dev/null
+++ b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
@@ -0,0 +1,22 @@
+---
+key_path: redis_hll_counters.pipeline_authoring.pipeline_authoring_total_unique_counts_monthly
+name: "0"
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 28d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml b/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml
new file mode 100644
index 00000000000..0f68989cc1d
--- /dev/null
+++ b/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml
@@ -0,0 +1,22 @@
+---
+key_path: usage_activity_by_stage_monthly.enablement.geo_secondary_web_oauth_users
+name: ""
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 28d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
new file mode 100644
index 00000000000..d81d1e96966
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
@@ -0,0 +1,15 @@
+---
+key_path: redis_hll_counters.analytics.i_analytics_instance_statistics_weekly
+description: Unique visitors to /admin/usage_trends by week
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+tier: []
+skip_validation: true
diff --git a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
new file mode 100644
index 00000000000..63d2eee8f4c
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
@@ -0,0 +1,15 @@
+---
+key_path: redis_hll_counters.analytics.analytics_total_unique_counts_weekly
+description: The number of unique users who visited any analytics feature by week
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+tier: []
+skip_validation: true
diff --git a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
new file mode 100644
index 00000000000..aaf56f066f9
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.source_code.merge_request_action_weekly
+description: Count of unique users who perform an action on a merge request
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
new file mode 100644
index 00000000000..726936cb49a
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.source_code.i_source_code_code_intelligence_weekly
+description: Count of unique users who use code intelligence
+product_section: dev
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
new file mode 100644
index 00000000000..928dd409445
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_mr_diffs_weekly
+description: Count of unique merge requests per week with diffs viewed
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
new file mode 100644
index 00000000000..9e1b3ae8dde
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_single_file_diffs_weekly
+description: Count of unique users per week with diffs viewed file by file
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
new file mode 100644
index 00000000000..a81b1f82c3d
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_mr_single_file_diffs_weekly
+description: Count of unique merge requests per week with diffs viewed file
+  by file
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
new file mode 100644
index 00000000000..4349c4111a8
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_weekly
+description: Count of unique users per week who created a MR
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
new file mode 100644
index 00000000000..30c2b4fb2e5
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_close_mr_weekly
+description: Count of unique users per week who closed a MR
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
new file mode 100644
index 00000000000..5867d24ad1a
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_reopen_mr_weekly
+description: Count of unique users per week who reopened a MR
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
new file mode 100644
index 00000000000..b659ed72265
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_merge_mr_weekly
+description: Count of unique users per week who merged a MR
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
new file mode 100644
index 00000000000..7d9bdb2fe05
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_comment_weekly
+description: Count of unique users per week who commented on a MR
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
new file mode 100644
index 00000000000..c00c652a27b
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_edit_mr_comment_weekly
+description: Count of unique users per week who edited a comment on a MR
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
new file mode 100644
index 00000000000..675ddb66f56
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_remove_mr_comment_weekly
+description: Count of unique users per month who removed a comment on a MR
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml b/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
new file mode 100644
index 00000000000..857a2cf17e9
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_add_suggestion_weekly
+description: Count of unique users per week who added a suggestion
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml b/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
new file mode 100644
index 00000000000..3c3cd7b6171
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_apply_suggestion_weekly
+description: Count of unique users per week who applied a suggestion
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
index f8c48ac20f9..362404036a5 100644
--- a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
+++ b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
@@ -9,10 +9,11 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: CountUsersUsingApproveQuickActionMetric
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate
\ No newline at end of file
+- ultimate
diff --git a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
new file mode 100644
index 00000000000..e887858fe96
--- /dev/null
+++ b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.source_code.wiki_action_weekly
+description: Count of unique actions done on a wiki (create, edit, delete)
+product_section: dev
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
new file mode 100644
index 00000000000..37744671757
--- /dev/null
+++ b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.source_code.design_action_weekly
+description: Count of total design actions (upload, delete, comment, reply)
+product_section: dev
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
new file mode 100644
index 00000000000..6f6dc87783a
--- /dev/null
+++ b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.source_code.project_action_weekly
+description: Count of unique actions done on projects and related resources (create, edit, delete, comment)
+product_section: dev
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
index c47fa49fe06..e14c0a39399 100644
--- a/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml
+++ b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
@@ -1,16 +1,18 @@
 ---
-key_path: usage_activity_by_stage_monthly.create.projects_enforcing_code_owner_approval
-description:
+key_path: redis_hll_counters.source_code.git_write_action_weekly
+description: Count of unique Git write actions
 product_section: dev
 product_stage: create
 product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
-time_frame: 28d
-data_source:
+time_frame: 7d
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
new file mode 100644
index 00000000000..f97747932a5
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_toggled_task_item_status_weekly
+description: Count of unique users per week who toggled a task item in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
new file mode 100644
index 00000000000..e220ecfb3fa
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_approve_mr_weekly
+description: Count of unique users per week who approve a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
new file mode 100644
index 00000000000..07db3a24ab9
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_unapprove_mr_weekly
+description: Count of unique users per week who unapprove a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
new file mode 100644
index 00000000000..faef58e57b7
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_resolve_thread_weekly
+description: Count of unique users per week who resolve a thread in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
new file mode 100644
index 00000000000..83962fbbb76
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_unresolve_thread_weekly
+description: Count of unique users per week who unresolve a thread in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
new file mode 100644
index 00000000000..2269498bea0
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_edit_mr_title_weekly
+description: Count of unique users per week who edit the title of a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
new file mode 100644
index 00000000000..618fed87951
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_edit_mr_desc_weekly
+description: Count of unique users per week who edit the description of a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
new file mode 100644
index 00000000000..5c2e8f2a66c
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_create_review_note_weekly
+description: Count of unique users per week who create a note as part of a merge request review
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
new file mode 100644
index 00000000000..4d686094bad
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_publish_review_weekly
+description: Count of unique users per week who publish their review as part of a merge request review
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
new file mode 100644
index 00000000000..bf7f7549958
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_create_multiline_mr_comment_weekly
+description: Count of unique users per week who create a multiline comment in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
new file mode 100644
index 00000000000..9fb4d36abc7
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_edit_multiline_mr_comment_weekly
+description: Count of unique users per week who edit a multiline comment in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
new file mode 100644
index 00000000000..a149c7cc7a5
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_remove_multiline_mr_comment_weekly
+description: Count of unique users per week who remove a multiline comment in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
new file mode 100644
index 00000000000..d376ac6501e
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_assigned_weekly
+description: Count of unique users per week who are assigned to a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
new file mode 100644
index 00000000000..af747413f41
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_marked_as_draft_weekly
+description: Count of unique users per week who mark a merge request as a draft
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
new file mode 100644
index 00000000000..5a99e741a7d
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_unmarked_as_draft_weekly
+description: Count of unique users per week who unmark a merge request as a draft
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
new file mode 100644
index 00000000000..8c946ccb418
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_review_requested_weekly
+description: Count of unique users per week who request a review of a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
new file mode 100644
index 00000000000..0716e3b702a
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_added_weekly
+description: Count of unique users per week who add an approval rule to a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
new file mode 100644
index 00000000000..f0a45edae21
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_deleted_weekly
+description: Count of unique users per week who delete an approval rule to a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
new file mode 100644
index 00000000000..f1abdb24875
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_edited_weekly
+description: Count of unique users per week who edit an approval rule to a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
new file mode 100644
index 00000000000..76ab0f54c34
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_vs_code_api_request_weekly
+description: Count of unique users per week who use GitLab Workflow for VS Code
+product_stage: create
+product_group: group::code review
+product_category: editor_extension
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
new file mode 100644
index 00000000000..4e2a71a4593
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_from_issue_weekly
+description: Count of unique users per week who create a merge request from an issue
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
new file mode 100644
index 00000000000..9b4c6cb0318
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
@@ -0,0 +1,17 @@
+---
+key_path: redis_hll_counters.code_review.code_review_total_unique_counts_weekly
+description: Count of unique users per week who interact with a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
new file mode 100644
index 00000000000..c6935a76319
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_weekly
+description: Number of projects using 5 min production app CI template in last 7 days.
+product_section: seg
+product_stage: deploy
+product_group: "group::5-min-app"
+product_category: five_minute_production_app
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+
diff --git a/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
new file mode 100644
index 00000000000..d9007dc1f8d
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_cf_deploy_ec2_weekly
+description: "Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.yml` template in last 7 days."
+product_section: ops
+product_stage: release
+product_group: "group::release"
+product_category: continuous_delivery
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
new file mode 100644
index 00000000000..f35cacdb4c9
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_deploy_ecs_weekly
+description: "Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in last 7 days."
+product_section: ops
+product_stage: release
+product_group: "group::release"
+product_category: continuous_delivery
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
new file mode 100644
index 00000000000..7fedcc5f05d
--- /dev/null
+++ b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.i_package_terraform_module_deploy_token_weekly
+description: Number of distinct users authorized via deploy token creating Terraform Module packages in recent 7 days
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
new file mode 100644
index 00000000000..49d8ad20126
--- /dev/null
+++ b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.user_packages.i_package_terraform_module_user_weekly
+description: Number of distinct users creating Terraform Module packages in recent 7 days
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml b/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
new file mode 100644
index 00000000000..179d2fa6e47
--- /dev/null
+++ b/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_click_single_file_mode_setting_weekly
+description: Count of users clicking single file mode setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml b/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
new file mode 100644
index 00000000000..50264bf27cf
--- /dev/null
+++ b/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_click_file_browser_setting_weekly
+description: Count of users with merge request file list setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml b/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
new file mode 100644
index 00000000000..3206bac8b49
--- /dev/null
+++ b/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_click_whitespace_setting_weekly
+description: Count of users clicking merge request whitespae setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml b/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
new file mode 100644
index 00000000000..7a3a606c886
--- /dev/null
+++ b/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_view_inline_weekly
+description: Count of users with merge request view type as inline
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml b/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
new file mode 100644
index 00000000000..36dbeae82e7
--- /dev/null
+++ b/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_view_parallel_weekly
+description: Count of users with merge request view type as parallel
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml b/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
new file mode 100644
index 00000000000..ef74ff6613f
--- /dev/null
+++ b/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_file_browser_tree_view_weekly
+description: Count of users with merge request file tree setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml b/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
new file mode 100644
index 00000000000..e2b9f141bb7
--- /dev/null
+++ b/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_file_browser_list_view_weekly
+description: Count of users with merge request file list setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml b/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
new file mode 100644
index 00000000000..6cca3840faa
--- /dev/null
+++ b/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_show_whitespace_weekly
+description: Count of users with show whitespace enabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml b/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
new file mode 100644
index 00000000000..c1fccc9f774
--- /dev/null
+++ b/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_hide_whitespace_weekly
+description: Count of users with show whitespace disabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml b/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
new file mode 100644
index 00000000000..3b1abf6e0e1
--- /dev/null
+++ b/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_single_file_weekly
+description: Count of users with single file mode enabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml b/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
new file mode 100644
index 00000000000..b3105b041f8
--- /dev/null
+++ b/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_multiple_files_weekly
+description: Count of users with single mode disabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
new file mode 100644
index 00000000000..31b36bc8ad7
--- /dev/null
+++ b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts_weekly.aggregated_metrics.code_review_group_monthly_active_users
+name: "0"
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 7d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
new file mode 100644
index 00000000000..aaf9350cdaa
--- /dev/null
+++ b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts_weekly.aggregated_metrics.code_review_category_monthly_active_users
+name: "0"
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 7d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
new file mode 100644
index 00000000000..ded67e19e10
--- /dev/null
+++ b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts_weekly.aggregated_metrics.code_review_extension_category_monthly_active_users
+name: ""
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 7d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
new file mode 100644
index 00000000000..7f782d90f8d
--- /dev/null
+++ b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
@@ -0,0 +1,22 @@
+---
+key_path: redis_hll_counters.pipeline_authoring.pipeline_authoring_total_unique_counts_weekly
+name: "0"
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 7d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
index 6885d8971d1..77baa673bb2 100644
--- a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
+++ b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
@@ -3,7 +3,7 @@ key_path: counts.cycle_analytics_views
 description:
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml b/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml
deleted file mode 100644
index 03271ea0f13..00000000000
--- a/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.productivity_analytics_views
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml b/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml
deleted file mode 100644
index a56358e7d13..00000000000
--- a/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.g_analytics_contribution
-description: Visits to /groups/:group/-/contribution_analytics
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216174838_g_analytics_insights.yml b/config/metrics/counts_all/20210216174838_g_analytics_insights.yml
deleted file mode 100644
index 72197fa6f29..00000000000
--- a/config/metrics/counts_all/20210216174838_g_analytics_insights.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.g_analytics_insights
-description: Visits to /groups/:group/-/insights
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216174840_g_analytics_issues.yml b/config/metrics/counts_all/20210216174840_g_analytics_issues.yml
deleted file mode 100644
index dc042c141e3..00000000000
--- a/config/metrics/counts_all/20210216174840_g_analytics_issues.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.g_analytics_issues
-description: Visits to /groups/:group/-/issues_analytics
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml b/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml
deleted file mode 100644
index eeab6200458..00000000000
--- a/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.g_analytics_productivity
-description: Visits to /groups/:group/-/analytics/productivity_analytics
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml b/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml
deleted file mode 100644
index 92399204faa..00000000000
--- a/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.g_analytics_valuestream
-description: Visits to /groups/:group/-/analytics/value_stream_analytics
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml b/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
index 8138873e882..3a263f167d6 100644
--- a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
+++ b/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
@@ -1,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.p_analytics_pipelines
-description: Visits to /:group/:project/pipelines/charts
+description: Unique visitors to /:group/:project/pipelines/charts
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml b/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml
deleted file mode 100644
index ac00c26a5ee..00000000000
--- a/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.p_analytics_code_reviews
-description: Visits to /:group/:project/-/analytics/code_reviews
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml b/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
index b2802ab9084..c33fb10c4cb 100644
--- a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
+++ b/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
@@ -1,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.p_analytics_valuestream
-description: Visits to /:group/:project/-/value_stream_analytics
+description: Unique visitors to /:group/:project/-/value_stream_analytics
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216174852_p_analytics_insights.yml b/config/metrics/counts_all/20210216174852_p_analytics_insights.yml
deleted file mode 100644
index 48c7e333b2c..00000000000
--- a/config/metrics/counts_all/20210216174852_p_analytics_insights.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.p_analytics_insights
-description: Visits to /:group/:project/insights
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216174854_p_analytics_issues.yml b/config/metrics/counts_all/20210216174854_p_analytics_issues.yml
deleted file mode 100644
index 86f7634ea32..00000000000
--- a/config/metrics/counts_all/20210216174854_p_analytics_issues.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.p_analytics_issues
-description: Visits to /:group/:project/-/analytics/issues_analytics
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml b/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
index 275cdd1e45b..1600feeb834 100644
--- a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
+++ b/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
@@ -1,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.p_analytics_repo
-description: Visits to /:group/:project/-/graphs/master/charts
+description: Unique visitors to /:group/:project/-/graphs/master/charts
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml b/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
index 14ff37dd4ad..2e5883b6fbf 100644
--- a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
+++ b/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
@@ -1,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.i_analytics_cohorts
-description: Visits to /-/instance_statistics/cohorts
+description: Unique visitors to /-/instance_statistics/cohorts
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml b/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml
index 586b9a15b70..7596572eaf1 100644
--- a/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml
+++ b/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml
@@ -1,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.i_analytics_dev_ops_score
-description: Visits to /-/instance_statistics/dev_ops_score
+description: Unique visitors to /-/instance_statistics/dev_ops_score
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
index 537a1c5dae8..bbd3bfca2b2 100644
--- a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
+++ b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
@@ -1,16 +1,17 @@
 ---
 key_path: analytics_unique_visits.g_analytics_merge_request
-description: Visits to /groups/:group/-/analytics/merge_request_analytics
+description: Unique visitors to /groups/:group/-/analytics/merge_request_analytics
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
-status: data_available
-time_frame: all
+status: removed
+time_frame: 7d
+data_source: redis_hll
 data_source:
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
+skip_validation: true
\ No newline at end of file
diff --git a/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml b/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml
deleted file mode 100644
index f8d509c9130..00000000000
--- a/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.p_analytics_merge_request
-description: Visits to /:group/:project/-/analytics/merge_request_analytics
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml b/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
index e834d6ae823..08e89517b8d 100644
--- a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
+++ b/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
@@ -1,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.i_analytics_instance_statistics
-description: Visit to /admin/instance_statistics
+description: Unique visitors to/admin/usage_trends
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml b/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
index d4d010ab419..cc0a21b1cb3 100644
--- a/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
+++ b/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
@@ -1,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.analytics_unique_visits_for_any_target
-description: Visits to any of the pages listed above per week
+description: Unique visitors to any analytics feature by week
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216175037_suggestions.yml b/config/metrics/counts_all/20210216175037_suggestions.yml
index 98ec2bd6d7c..cfe0b3e361e 100644
--- a/config/metrics/counts_all/20210216175037_suggestions.yml
+++ b/config/metrics/counts_all/20210216175037_suggestions.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.suggestions
-description:
+description: Count of all comments that contain suggested changes
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210216175039_merge_requests.yml b/config/metrics/counts_all/20210216175039_merge_requests.yml
index 3c17daf2622..b3514e64df8 100644
--- a/config/metrics/counts_all/20210216175039_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175039_merge_requests.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.merge_requests
-description:
+description: Count of the number of merge requests
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175041_merge_request_comment.yml b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
index 382110c11db..b53fbb14ffc 100644
--- a/config/metrics/counts_all/20210216175041_merge_request_comment.yml
+++ b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.merge_request_comment
-description:
+description: Count of the number of merge request comments
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -8,9 +8,11 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175043_merge_request_create.yml b/config/metrics/counts_all/20210216175043_merge_request_create.yml
index 39ce0ef072a..38d1d72339b 100644
--- a/config/metrics/counts_all/20210216175043_merge_request_create.yml
+++ b/config/metrics/counts_all/20210216175043_merge_request_create.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.merge_request_create
-description:
+description: Count of the number of merge requests created
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -8,9 +8,11 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175045_merge_requests.yml b/config/metrics/counts_all/20210216175045_merge_requests.yml
index 47966f197e4..51715e14584 100644
--- a/config/metrics/counts_all/20210216175045_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175045_merge_requests.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage.create.merge_requests
-description:
+description: Count of the number of users creating merge requests
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -8,9 +8,11 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175053_suggestions.yml b/config/metrics/counts_all/20210216175053_suggestions.yml
index 15a846c49d8..507200a0ac8 100644
--- a/config/metrics/counts_all/20210216175053_suggestions.yml
+++ b/config/metrics/counts_all/20210216175053_suggestions.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage.create.suggestions
-description:
+description: Count of unique users who create suggestions in merge request comments
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -8,9 +8,11 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
index 2f134ac7076..8149967d22e 100644
--- a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
+++ b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
@@ -1,8 +1,8 @@
 ---
 key_path: counts.auto_devops_enabled
-description: Projects with Auto DevOps template enabled
+description: Projects with Auto DevOps template enabled (excluding implicit Auto DevOps enabled and Auto DevOps template includes)
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: auto_devops
 value_type: number
@@ -11,6 +11,8 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175234_clusters_enabled.yml b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
index 7aad6d73bff..58db69494d6 100644
--- a/config/metrics/counts_all/20210216175234_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
@@ -1,8 +1,8 @@
 ---
 key_path: counts.clusters_enabled
-description: Total GitLab Managed clusters currently enabled
+description: Number of Kubernetes clusters attached to GitLab currently enabled
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175242_clusters_disabled.yml b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
index d1a14f8f3a5..1226218d7dd 100644
--- a/config/metrics/counts_all/20210216175242_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
@@ -1,8 +1,8 @@
 ---
 key_path: counts.clusters_disabled
-description: Total GitLab Managed disabled clusters
+description: Number of Kubernetes clusters attached to GitLab currently disabled
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
index 3bab0578a71..a8ba5b65187 100644
--- a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
@@ -2,7 +2,7 @@
 key_path: counts.clusters_applications_runner
 description: Total GitLab Managed clusters with GitLab Managed App:Runner installed
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
index 8e48a723caa..00810d99086 100644
--- a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
@@ -13,4 +13,5 @@ distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
index 9854006b1dc..905c78f88df 100644
--- a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
@@ -13,4 +13,5 @@ distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175324_terraform_reports.yml b/config/metrics/counts_all/20210216175324_terraform_reports.yml
index 4b83d4c944c..7bb3b409fbb 100644
--- a/config/metrics/counts_all/20210216175324_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175324_terraform_reports.yml
@@ -13,4 +13,5 @@ distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175326_terraform_states.yml b/config/metrics/counts_all/20210216175326_terraform_states.yml
index c9696eaf26e..92f89b8a325 100644
--- a/config/metrics/counts_all/20210216175326_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175326_terraform_states.yml
@@ -1,8 +1,8 @@
 ---
 key_path: counts.terraform_states
-description: Count of GitLab Managed Terraform States used
+description: Count of GitLab Managed Terraform States
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
@@ -13,4 +13,5 @@ distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175510_ci_builds.yml b/config/metrics/counts_all/20210216175510_ci_builds.yml
index a70878ce352..5efe8e30dfd 100644
--- a/config/metrics/counts_all/20210216175510_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175510_ci_builds.yml
@@ -11,6 +11,8 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
index 425da65a0d5..3c924b71ed5 100644
--- a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
@@ -11,6 +11,8 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
index bf62f8096df..49846e9521d 100644
--- a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
@@ -13,4 +13,3 @@ distribution:
 - ce
 tier:
 - free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
index ac9ce910867..39fa444351f 100644
--- a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
@@ -2,15 +2,17 @@
 key_path: counts.ci_pipeline_config_auto_devops
 description: Total pipelines from an Auto DevOps template
 product_section: ops
-product_stage: verify
-product_group: group::continuous integration
-product_category: continuous_integration
+product_stage: configure
+product_group: group::configure
+product_category: auto_devops
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
index dc796d25bb0..95f160bac0e 100644
--- a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
@@ -11,6 +11,8 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175520_ci_runners.yml b/config/metrics/counts_all/20210216175520_ci_runners.yml
index 4bac8d39737..991e966b05e 100644
--- a/config/metrics/counts_all/20210216175520_ci_runners.yml
+++ b/config/metrics/counts_all/20210216175520_ci_runners.yml
@@ -11,6 +11,8 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175521_ci_triggers.yml b/config/metrics/counts_all/20210216175521_ci_triggers.yml
index 5a2015d6fdf..38d5b621d0f 100644
--- a/config/metrics/counts_all/20210216175521_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175521_ci_triggers.yml
@@ -11,6 +11,8 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
index 330b0b64e26..7c8aeac67b4 100644
--- a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
@@ -11,6 +11,8 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175525_ci_builds.yml b/config/metrics/counts_all/20210216175525_ci_builds.yml
index a9a5d9f6a88..16f1e46c94f 100644
--- a/config/metrics/counts_all/20210216175525_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175525_ci_builds.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage.verify.ci_builds
-description: Unique builds in project
+description: Unique count of builds in project
 product_section: ops
 product_stage: verify
 product_group: group::continuous integration
@@ -8,9 +8,11 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
index bc29f8fd33c..f97d7f31b67 100644
--- a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
@@ -8,9 +8,11 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
index 9eb1541828f..700152cc710 100644
--- a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
@@ -8,9 +8,11 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
index 046f94261e1..af5ecbf5a63 100644
--- a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
@@ -2,15 +2,17 @@
 key_path: usage_activity_by_stage.verify.ci_pipeline_config_auto_devops
 description: Total pipelines from an Auto DevOps template
 product_section: ops
-product_stage: verify
-product_group: group::continuous integration
-product_category: continuous_integration
+product_stage: configure
+product_group: group::configure
+product_category: auto_devops
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
index 6daf1a8fbd6..a7d45a74e72 100644
--- a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
@@ -8,9 +8,12 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+
diff --git a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
index be012a5ff3e..dc34481c495 100644
--- a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
@@ -8,9 +8,11 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175537_ci_pipelines.yml b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
index e9394e70fd1..9447661e19c 100644
--- a/config/metrics/counts_all/20210216175537_ci_pipelines.yml
+++ b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
@@ -8,10 +8,11 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175539_ci_triggers.yml b/config/metrics/counts_all/20210216175539_ci_triggers.yml
index d284687894a..85a7f097574 100644
--- a/config/metrics/counts_all/20210216175539_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175539_ci_triggers.yml
@@ -8,9 +8,11 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
index cc49000a57f..32bbcb11c30 100644
--- a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
@@ -6,7 +6,8 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.11'
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
index 1496bc21bcd..1a8224ba446 100644
--- a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
@@ -6,7 +6,8 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.11'
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
index 3f285fe0ed6..6b24dedf93a 100644
--- a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
@@ -6,7 +6,8 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.11'
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
index 0e2f5c5fe1b..18d5e6f9666 100644
--- a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
@@ -6,7 +6,8 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.11'
 time_frame: all
 data_source: database
 distribution:
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 0980e3b587c..da9f9df4fb7 100644
--- a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
@@ -6,7 +6,8 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.11'
 time_frame: all
 data_source: database
 distribution:
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 63c4ee9771d..4d4c265d377 100644
--- a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
@@ -6,7 +6,8 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.11'
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml b/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
index 7f7c3b4d91a..bd4a4ed3e61 100644
--- a/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
+++ b/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
@@ -6,7 +6,8 @@ product_stage: monitor
 product_group: group::health
 product_category: incident_management
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.12'
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
index 09816e1b0f1..6a92f868665 100644
--- a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
+++ b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
@@ -1,10 +1,10 @@
 ---
 key_path: counts.grafana_integrated_projects
-description:
+description: Total Grafana integrations attached to projects
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: all
@@ -13,4 +13,3 @@ distribution:
 - ce
 tier:
 - free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
index 6ce96c5750d..a3a5f2d8ffb 100644
--- a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
@@ -10,7 +10,9 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
index f2a3e296e8b..abcd64de00f 100644
--- a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
index 446e8904be8..c751569efc9 100644
--- a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
index 519fc355a44..50b4230ce3b 100644
--- a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
index 7536c43b9f1..66a696d2187 100644
--- a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
index 38e002e0a2a..4ed70e76fa7 100644
--- a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
index 0460ddd1ca4..039d4dcb7cb 100644
--- a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
@@ -4,13 +4,15 @@ description: Active users with enabled operations dashboard
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
index 3c1bb134c17..71988b43ed8 100644
--- a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
@@ -4,13 +4,15 @@ description: Active users with projects on operations dashboard
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_all/20210216180945_clusters.yml b/config/metrics/counts_all/20210216180945_clusters.yml
index 25a52cf9ffa..1af33097b7f 100644
--- a/config/metrics/counts_all/20210216180945_clusters.yml
+++ b/config/metrics/counts_all/20210216180945_clusters.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage.monitor.clusters
-description: Total GitLab Managed clusters both enabled and disabled
+description: Users creating clusters.
 product_section: ops
 product_stage:
 product_group: group::monitor
@@ -8,9 +8,11 @@ product_category: metrics
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
index cc15b3563b5..c59ea4b8a85 100644
--- a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage.monitor.clusters_applications_prometheus
-description: Total GitLab Managed clusters with Prometheus enabled
+description: Users creating clusters with Prometheus enabled.
 product_section: ops
 product_stage:
 product_group: group::monitor
@@ -8,9 +8,11 @@ product_category: metrics
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
index f037d7ea5c2..4881fce06a3 100644
--- a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
@@ -4,13 +4,14 @@ description: Active users with enabled operations dashboard
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
diff --git a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
index fc362feda69..26c5073cae1 100644
--- a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
@@ -8,9 +8,11 @@ product_category: tracing
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
index 6f6f4b00d1a..3e86ba6c54c 100644
--- a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
@@ -4,13 +4,15 @@ description: Active users with projects on operations dashboard
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_all/20210216181102_issues.yml b/config/metrics/counts_all/20210216181102_issues.yml
index ca89db705f1..8875b0bbc81 100644
--- a/config/metrics/counts_all/20210216181102_issues.yml
+++ b/config/metrics/counts_all/20210216181102_issues.yml
@@ -9,6 +9,7 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
+instrumentation_class: CountIssuesMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216181115_issues.yml b/config/metrics/counts_all/20210216181115_issues.yml
index 0c4db95b275..3843184aa10 100644
--- a/config/metrics/counts_all/20210216181115_issues.yml
+++ b/config/metrics/counts_all/20210216181115_issues.yml
@@ -9,6 +9,7 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
+instrumentation_class: CountUsersCreatingIssuesMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216181252_boards.yml b/config/metrics/counts_all/20210216181252_boards.yml
index 7552c7289c7..ddf55cc6282 100644
--- a/config/metrics/counts_all/20210216181252_boards.yml
+++ b/config/metrics/counts_all/20210216181252_boards.yml
@@ -1,18 +1,19 @@
 ---
 key_path: counts.boards
-description: Count of total Boards created 
+description: Count of Boards created
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: boards 
+product_category: boards
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
+instrumentation_class: CountBoardsMetric
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate 
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml b/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml
deleted file mode 100644
index c0748285bf9..00000000000
--- a/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.projects_mirrored_with_pipelines_enabled
-description: Projects with repository mirroring enabled
-product_section: ops
-product_stage:
-product_group: group::release
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml b/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml
deleted file mode 100644
index ce760884642..00000000000
--- a/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.release.projects_mirrored_with_pipelines_enabled
-description: Projects with repository mirroring enabled
-product_section: ops
-product_stage:
-product_group: group::release
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
index 3b36b410b3a..3e84a694e96 100644
--- a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
@@ -1,19 +1,18 @@
 ---
 key_path: usage_activity_by_stage.verify.clusters_applications_runner
-description: Total GitLab Managed clusters with Runner enabled
+description: Count of users creating managed clusters with Runner enabled
 product_section: ops
-product_stage: verify
-product_group: group::runner
-product_category: runner
+product_stage: configure
+product_group: group::configure
+product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
 - premium
-- ultimate
-skip_validation: true
+- ultimate
\ No newline at end of file
diff --git a/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml b/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
deleted file mode 100644
index 926ed501639..00000000000
--- a/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.projects_with_repositories_enabled
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182001_protected_branches.yml b/config/metrics/counts_all/20210216182001_protected_branches.yml
deleted file mode 100644
index cbd378bd93a..00000000000
--- a/config/metrics/counts_all/20210216182001_protected_branches.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.protected_branches
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182002_remote_mirrors.yml b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
index f344a7c1640..c784bc57a00 100644
--- a/config/metrics/counts_all/20210216182002_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.remote_mirrors
-description:
+description: Count of total remote mirrors. Includes both push and pull mirrors
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -11,6 +11,8 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index 2e427d14acd..b7d7c08196a 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.commit_comment
-description:
+description: Count of total unique commit comments. Does not include MR diff comments
 product_section: dev
 product_stage: create
 product_group: group::source code
-product_category: code_review
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182006_source_code_pushes.yml b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
index 824761adaee..980314f6829 100644
--- a/config/metrics/counts_all/20210216182006_source_code_pushes.yml
+++ b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.source_code_pushes
-description:
+description: Count of total Git push operations
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182008_template_repositories.yml b/config/metrics/counts_all/20210216182008_template_repositories.yml
deleted file mode 100644
index 888f5d96ab6..00000000000
--- a/config/metrics/counts_all/20210216182008_template_repositories.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.template_repositories
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182010_deploy_keys.yml b/config/metrics/counts_all/20210216182010_deploy_keys.yml
index 2ddc48c2e0a..c7af2e13af2 100644
--- a/config/metrics/counts_all/20210216182010_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216182010_deploy_keys.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage.create.deploy_keys
-description:
+description: Count of users creating deploy keys.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182012_keys.yml b/config/metrics/counts_all/20210216182012_keys.yml
index 1872abc6776..449b56b6994 100644
--- a/config/metrics/counts_all/20210216182012_keys.yml
+++ b/config/metrics/counts_all/20210216182012_keys.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage.create.keys
-description:
+description: Count of users creating regular keys.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
index 62883077ad5..7ddcdde577c 100644
--- a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage.create.projects_with_disable_overriding_approvers_per_merge_request
-description:
+description: Total count of projects that do not allow overriding approvers on discrete merge requests
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,10 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
index 8518e3700bb..78ba2fed801 100644
--- a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage.create.projects_without_disable_overriding_approvers_per_merge_request
-description:
+description: Count of total projects that do not disable overriding approvers per discrete merge request
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,10 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182017_remote_mirrors.yml b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
index f9edec7260b..e3b25e3bd37 100644
--- a/config/metrics/counts_all/20210216182017_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage.create.remote_mirrors
-description:
+description: Count of users creating projects with remote mirrors.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml b/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
deleted file mode 100644
index 3ccbc99a4f1..00000000000
--- a/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.projects_enforcing_code_owner_approval
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml b/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml
deleted file mode 100644
index fcba0993477..00000000000
--- a/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.projects_with_sectional_code_owner_rules
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml b/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml
deleted file mode 100644
index a850295aea6..00000000000
--- a/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.projects_with_repositories_enabled
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182025_protected_branches.yml b/config/metrics/counts_all/20210216182025_protected_branches.yml
deleted file mode 100644
index f914c5dae6c..00000000000
--- a/config/metrics/counts_all/20210216182025_protected_branches.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.protected_branches
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml b/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml
deleted file mode 100644
index 9ce0b935888..00000000000
--- a/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.total_number_of_path_locks
-description: The total number of default branch locks done through the GitLab UI
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml b/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml
deleted file mode 100644
index 136472a59e4..00000000000
--- a/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.total_number_of_locked_files
-description: The total number of exclusive file locks (through the CLI)
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
index 66f616f16ee..cae090955c1 100644
--- a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
+++ b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.protected_branches_except_default
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of branches that have been protected and are not the default branch
+product_section: dev
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml b/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml
deleted file mode 100644
index a2f3c2a6002..00000000000
--- a/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.merge_requests_with_overridden_project_rules
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216183344_users_using_path_locks.yml b/config/metrics/counts_all/20210216183344_users_using_path_locks.yml
deleted file mode 100644
index f75db6ede2e..00000000000
--- a/config/metrics/counts_all/20210216183344_users_using_path_locks.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.users_using_path_locks
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml b/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml
deleted file mode 100644
index b232c6bbb41..00000000000
--- a/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.users_using_lfs_locks
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml b/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml
deleted file mode 100644
index 4afb690ddc4..00000000000
--- a/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.approval_project_rules_with_more_approvers_than_required
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml b/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml
deleted file mode 100644
index 3ef906e10da..00000000000
--- a/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.approval_project_rules_with_less_approvers_than_required
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml b/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml
deleted file mode 100644
index 1397b1b57e2..00000000000
--- a/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.approval_project_rules_with_exact_required_approvers
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml b/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
index 6d393fad3a3..ae13c280d89 100644
--- a/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
+++ b/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+value_json_schema: 'config/metrics/objects_schemas/projects_with_enabled_alert_integrations_histogram.json'
diff --git a/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml b/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
new file mode 100644
index 00000000000..d16181a9531
--- /dev/null
+++ b/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
@@ -0,0 +1,20 @@
+---
+key_path: counts.package_events_i_package_terraform_module_delete_package
+description: Total count of Terraform Module packages delete events
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
+time_frame: all
+data_source: redis
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml b/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
new file mode 100644
index 00000000000..fcb11b68ccf
--- /dev/null
+++ b/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
@@ -0,0 +1,20 @@
+---
+key_path: counts.package_events_i_package_terraform_module_pull_package
+description: Total count of pull Terraform Module packages events
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
+time_frame: all
+data_source: redis
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml b/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
new file mode 100644
index 00000000000..c9812f109a0
--- /dev/null
+++ b/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
@@ -0,0 +1,20 @@
+---
+key_path: counts.package_events_i_package_terraform_module_push_package
+description: Total count of push Terraform Module packages events
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
+time_frame: all
+data_source: redis
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml b/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml
new file mode 100644
index 00000000000..54dffb5573a
--- /dev/null
+++ b/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml
@@ -0,0 +1,21 @@
+---
+key_path: analytics_unique_visits.i_analytics_dev_ops_adoption
+name: "<please fill metric name, suggested format is: {subject}_{verb}{ing|ed}_{object} eg: users_creating_epics or merge_requests_viewed_in_single_file_mode>"
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.11"
+introduced_by_url:
+time_frame: all
+data_source:
+distribution:
+- ce
+# tier:
+# - free
+# - premium
+# - ultimate
+skip_validation: true
diff --git a/config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml b/config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml
new file mode 100644
index 00000000000..0ce05fb84e2
--- /dev/null
+++ b/config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml
@@ -0,0 +1,22 @@
+---
+key_path: usage_activity_by_stage.enablement.geo_secondary_web_oauth_users
+name: ""
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: all
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml b/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml
new file mode 100644
index 00000000000..c3fb808541a
--- /dev/null
+++ b/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml
@@ -0,0 +1,22 @@
+---
+key_path: analytics_unique_visits.users_viewing_analytics_group_devops_adoption
+name: "<please fill metric name, suggested format is: {subject}_{verb}{ing|ed}_{object} eg: users_creating_epics or merge_requests_viewed_in_single_file_mode>"
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: all
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
new file mode 100644
index 00000000000..2d42796514d
--- /dev/null
+++ b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.ci_runners_instance_type_active
+name: "count_active_instance_ci_runners"
+description: Total active group Runners
+product_section: ops
+product_stage: verify
+product_group: group::continuous integration
+product_category: continuous_integration
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
new file mode 100644
index 00000000000..49c99ce13ad
--- /dev/null
+++ b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.ci_runners_group_type_active
+name: "count_active_group_ci_runners"
+description: Total active instance Runners
+product_section: ops
+product_stage: verify
+product_group: group::continuous integration
+product_category: continuous_integration
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
new file mode 100644
index 00000000000..0c442466199
--- /dev/null
+++ b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.ci_runners_project_type_active
+name: "count_active_project_ci_runners"
+description: Total active project Runners
+product_section: ops
+product_stage: verify
+product_group: group::continuous integration
+product_category: continuous_integration
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210502050942_ci_runners_online.yml b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
new file mode 100644
index 00000000000..d661767095f
--- /dev/null
+++ b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.ci_runners_online
+name: "counts_online_runners"
+description: Total online Runners
+product_section: ops
+product_stage: verify
+product_group: group::continuous integration
+product_category: continuous_integration
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml b/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
new file mode 100644
index 00000000000..d5b2bb2eab8
--- /dev/null
+++ b/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.ci_runners_instance_type_active_online
+name: "count_instance_active_online_ci_runners"
+description: Total active and online instance Runners
+product_section: ops
+product_stage: verify
+product_group: group::continuous integration
+product_category: continuous_integration
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml b/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
new file mode 100644
index 00000000000..cedf120bfc1
--- /dev/null
+++ b/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.ci_runners_group_type_active_online
+name: "count_group_active_online_ci_runners"
+description: Total active and online group Runners
+product_section: ops
+product_stage: verify
+product_group: group::continuous integration
+product_category: continuous_integration
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml b/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
new file mode 100644
index 00000000000..dbedcc7540d
--- /dev/null
+++ b/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.ci_runners_project_type_active_online
+name: "count_project_active_online_ci_runners"
+description: Total active and online project Runners
+product_section: ops
+product_stage: verify
+product_group: group::continuous integration
+product_category: continuous_integration
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..bbfae3eb114
--- /dev/null
+++ b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_create_0_sent
+name: "count_sent_first_email_of_the_create_track_for_in_product_marketing_emails"
+description: Total sent emails of the create track's first email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..a2cf7c6d813
--- /dev/null
+++ b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.in_product_marketing_email_create_0_cta_clicked
+name: "count_clicks_on_the_first_email_of_the_create_track_for_in_product_marketing_emails"
+description: Total clicks on the create track's first email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+
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
new file mode 100644
index 00000000000..85552f42431
--- /dev/null
+++ b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_create_1_sent
+name: "count_sent_second_email_of_the_create_track_for_in_product_marketing_emails"
+description: Total sent emails of the create track's second email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..7a1e5f28c22
--- /dev/null
+++ b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.in_product_marketing_email_create_1_cta_clicked
+name: "count_clicks_on_the_second_email_of_the_create_track_for_in_product_marketing_emails"
+description: Total clicks on the create track's second email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+
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
new file mode 100644
index 00000000000..02d5ae115bb
--- /dev/null
+++ b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_create_2_sent
+name: "count_sent_third_email_of_the_create_track_for_in_product_marketing_emails"
+description: Total sent emails of the create track's third email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..75eafa3a54f
--- /dev/null
+++ b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_create_2_cta_clicked
+name: "count_clicks_on_the_third_email_of_the_create_track_for_in_product_marketing_emails"
+description: Total clicks on the create track's third email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..0a5a9ef936f
--- /dev/null
+++ b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_verify_0_sent
+name: "count_sent_first_email_of_the_verify_track_for_in_product_marketing_emails"
+description: Total sent emails of the verify track's first email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..17e677ba29d
--- /dev/null
+++ b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_verify_0_cta_clicked
+name: "count_clicks_on_the_first_email_of_the_verify_track_for_in_product_marketing_emails"
+description: Total clicks on the verify track's first email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..2bad6d31db2
--- /dev/null
+++ b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_verify_1_sent
+name: "count_sent_second_email_of_the_verify_track_for_in_product_marketing_emails"
+description: Total sent emails of the verify track's second email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..66080d46e7f
--- /dev/null
+++ b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.in_product_marketing_email_verify_1_cta_clicked
+name: "count_clicks_on_the_second_email_of_the_verify_track_for_in_product_marketing_emails"
+description: Total clicks on the verify track's second email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+
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
new file mode 100644
index 00000000000..2beabb8b007
--- /dev/null
+++ b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_verify_2_sent
+name: "count_sent_third_email_of_the_verify_track_for_in_product_marketing_emails"
+description: Total sent emails of the verify track's third email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..7213c463fa9
--- /dev/null
+++ b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_verify_2_cta_clicked
+name: "count_clicks_on_the_third_email_of_the_verify_track_for_in_product_marketing_emails"
+description: Total clicks on the verify track's third email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..dc566f03898
--- /dev/null
+++ b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_trial_0_sent
+name: "count_sent_first_email_of_the_trial_track_for_in_product_marketing_emails"
+description: Total sent emails of the trial track's first email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..a3cf714e5ad
--- /dev/null
+++ b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_trial_0_cta_clicked
+name: "count_clicks_on_the_first_email_of_the_trial_track_for_in_product_marketing_emails"
+description: Total clicks on the verify trial's first email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..f5215090b7e
--- /dev/null
+++ b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_trial_1_sent
+name: "count_sent_second_email_of_the_trial_track_for_in_product_marketing_emails"
+description: Total sent emails of the trial track's second email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..651c5426e2a
--- /dev/null
+++ b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.in_product_marketing_email_trial_1_cta_clicked
+name: "count_clicks_on_the_second_email_of_the_trial_track_for_in_product_marketing_emails"
+description: Total clicks on the trial track's second email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+
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
new file mode 100644
index 00000000000..4be98d45ce2
--- /dev/null
+++ b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_trial_2_sent
+name: "count_sent_third_email_of_the_trial_track_for_in_product_marketing_emails"
+description: Total sent emails of the trial track's third email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..6be928da906
--- /dev/null
+++ b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_trial_2_cta_clicked
+name: "count_clicks_on_the_third_email_of_the_trial_track_for_in_product_marketing_emails"
+description: Total clicks on the trial track's third email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..ac9ffa730f1
--- /dev/null
+++ b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_team_0_sent
+name: "count_sent_first_email_of_the_trial_team_for_in_product_marketing_emails"
+description: Total sent emails of the team track's first email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..cf51512c6eb
--- /dev/null
+++ b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_team_0_cta_clicked
+name: "count_clicks_on_the_first_email_of_the_team_track_for_in_product_marketing_emails"
+description: Total clicks on the team track's first email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..b860b08e391
--- /dev/null
+++ b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_team_1_sent
+name: "count_sent_second_email_of_the_team_track_for_in_product_marketing_emails"
+description: Total sent emails of the team track's second email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..c0f63cadbf2
--- /dev/null
+++ b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.in_product_marketing_email_team_1_cta_clicked
+name: "count_clicks_on_the_second_email_of_the_team_track_for_in_product_marketing_emails"
+description: Total clicks on the team track's second email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+
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
new file mode 100644
index 00000000000..887334c65c7
--- /dev/null
+++ b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_team_2_sent
+name: "count_sent_third_email_of_the_team_track_for_in_product_marketing_emails"
+description: Total sent emails of the team track's third email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..6dac2db454a
--- /dev/null
+++ b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_team_2_cta_clicked
+name: "count_clicks_on_the_third_email_of_the_team_track_for_in_product_marketing_emails"
+description: Total clicks on the team track's third email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/license/20210201124932_recorded_at.yml b/config/metrics/license/20210201124932_recorded_at.yml
index 4b9cfc900d6..88f27fff377 100644
--- a/config/metrics/license/20210201124932_recorded_at.yml
+++ b/config/metrics/license/20210201124932_recorded_at.yml
@@ -10,7 +10,7 @@ status: data_available
 milestone: "8.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 time_frame: none
-data_source: ruby
+data_source: system
 distribution:
 - ee
 - ce
diff --git a/config/metrics/license/20210201124933_uuid.yml b/config/metrics/license/20210201124933_uuid.yml
index 9146bf1e070..afad2cf540a 100644
--- a/config/metrics/license/20210201124933_uuid.yml
+++ b/config/metrics/license/20210201124933_uuid.yml
@@ -11,6 +11,7 @@ milestone: "9.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1521
 time_frame: none
 data_source: database
+instrumentation_class: UuidMetric
 distribution:
 - ee
 - ce
diff --git a/config/metrics/license/20210204124827_hostname.yml b/config/metrics/license/20210204124827_hostname.yml
index 6f878f04863..953239eff7a 100644
--- a/config/metrics/license/20210204124827_hostname.yml
+++ b/config/metrics/license/20210204124827_hostname.yml
@@ -8,7 +8,8 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
+instrumentation_class: HostnameMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/license/20210204124926_license_trial_ends_on.yml b/config/metrics/license/20210204124926_license_trial_ends_on.yml
index e3c3303975f..fb9ec099a46 100644
--- a/config/metrics/license/20210204124926_license_trial_ends_on.yml
+++ b/config/metrics/license/20210204124926_license_trial_ends_on.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/license/20210204124928_version.yml b/config/metrics/license/20210204124928_version.yml
index b39552b220e..9aea9f8fde5 100644
--- a/config/metrics/license/20210204124928_version.yml
+++ b/config/metrics/license/20210204124928_version.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/license/20210204124936_version.yml b/config/metrics/license/20210204124936_version.yml
index 2d161e15fd0..ef87a6ed9e6 100644
--- a/config/metrics/license/20210204124936_version.yml
+++ b/config/metrics/license/20210204124936_version.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/license/20210204124938_recording_ce_finished_at.yml b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
index b1fd0589e4a..d07580730c1 100644
--- a/config/metrics/license/20210204124938_recording_ce_finished_at.yml
+++ b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source: ruby
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/license/20210216175601_version.yml b/config/metrics/license/20210216175601_version.yml
index b3099eb76bd..5e5c1ad05ec 100644
--- a/config/metrics/license/20210216175601_version.yml
+++ b/config/metrics/license/20210216175601_version.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/license/20210216175602_installation_type.yml b/config/metrics/license/20210216175602_installation_type.yml
index ae5f26ff0a2..6e907b4a823 100644
--- a/config/metrics/license/20210216175602_installation_type.yml
+++ b/config/metrics/license/20210216175602_installation_type.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source: ruby
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/license/20210216181053_version.yml b/config/metrics/license/20210216181053_version.yml
index 3570a041b8f..824167c8d97 100644
--- a/config/metrics/license/20210216181053_version.yml
+++ b/config/metrics/license/20210216181053_version.yml
@@ -8,7 +8,7 @@ product_category:
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/license/20210216183237_version.yml b/config/metrics/license/20210216183237_version.yml
index 4f74963801a..69d97e17f20 100644
--- a/config/metrics/license/20210216183237_version.yml
+++ b/config/metrics/license/20210216183237_version.yml
@@ -8,7 +8,7 @@ product_category: ''
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/objects_schemas/projects_with_enabled_alert_integrations_histogram.json b/config/metrics/objects_schemas/projects_with_enabled_alert_integrations_histogram.json
new file mode 100644
index 00000000000..63a74061d91
--- /dev/null
+++ b/config/metrics/objects_schemas/projects_with_enabled_alert_integrations_histogram.json
@@ -0,0 +1,7 @@
+{
+  "type": "object",
+  "description": "Histogram (buckets 1 to 100) of projects with at least 1 enabled integration"
+  "propertyNames": {
+    "pattern": "^[1-9][0-9]?0?$"
+  }
+}
diff --git a/config/metrics/schema.json b/config/metrics/schema.json
index 4c10aca7061..e9a4a16ecd3 100644
--- a/config/metrics/schema.json
+++ b/config/metrics/schema.json
@@ -43,13 +43,20 @@
     "introduced_by_url": {
       "type": ["string", "null"]
     },
+    "extra": {
+      "type": "object"
+    },
     "time_frame": {
       "type": "string",
       "enum": ["7d", "28d", "all", "none"]
     },
     "data_source": {
       "type": "string",
-      "enum": ["database", "redis", "redis_hll", "prometheus", "ruby"]
+      "enum": ["database", "redis", "redis_hll", "prometheus", "system"]
+    },
+    "instrumentation_class": {
+      "type": "string",
+      "pattern": "^(([A-Z][a-z]+)+::)*(([A-Z][a-z]+)+)$"
     },
     "distribution": {
       "type": "array",
@@ -67,6 +74,9 @@
     },
     "skip_validation": {
       "type": "boolean"
+    },
+    "value_json_schema": {
+      "type": "string"
     }
   }
 }
diff --git a/config/metrics/settings/20210201124935_database_adapter.yml b/config/metrics/settings/20210201124935_database_adapter.yml
index 020325995b1..66a9e5fd52a 100644
--- a/config/metrics/settings/20210201124935_database_adapter.yml
+++ b/config/metrics/settings/20210201124935_database_adapter.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source: database
+data_source: system
 distribution:
 - ee
 - ce
diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
index 6f05eacbe5a..dc6db53f8ab 100644
--- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
@@ -1,16 +1,18 @@
 ---
 key_path: instance_auto_devops_enabled
 description: Whether auto DevOps is enabled
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: auto_devops
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index 6c50cb9144e..d8a47a39912 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
index 01feb7157d9..f7aa195f284 100644
--- a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
index ed9491959ae..2b6f1d41413 100644
--- a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -1,16 +1,18 @@
 ---
 key_path: gitlab_shared_runners_enabled
 description: Whether shared runners is enabled
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+product_section: ops
+product_stage: verify
+product_group: group::runner
+product_category: runner
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index 21758753b35..b0280347b9f 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
index 6dc1a62d337..589897fb15b 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
index 425f3c44511..a3c88cf976e 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
index f9e691b0516..67d1515abc5 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124912_prometheus_enabled.yml b/config/metrics/settings/20210204124912_prometheus_enabled.yml
index ca829933eda..092f273e237 100644
--- a/config/metrics/settings/20210204124912_prometheus_enabled.yml
+++ b/config/metrics/settings/20210204124912_prometheus_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
index f9566076c9e..43a13aff5e1 100644
--- a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
+++ b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
index f2fb58e33ec..40b863cd225 100644
--- a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
index 36e228bf927..b63a571c6b9 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -8,7 +8,7 @@ product_category: authentication_and_authorization
 value_type: boolean
 status: data_available
 time_frame: none
-data_source: database
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
index 4f21c0f2f18..bfb143d2013 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124922_grafana_link_enabled.yml b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
index 596ae1384ca..c7e971f1a27 100644
--- a/config/metrics/settings/20210204124922_grafana_link_enabled.yml
+++ b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
@@ -8,9 +8,8 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
diff --git a/config/metrics/settings/20210204124934_enabled.yml b/config/metrics/settings/20210204124934_enabled.yml
index 2f2586ad8f4..def857192eb 100644
--- a/config/metrics/settings/20210204124934_enabled.yml
+++ b/config/metrics/settings/20210204124934_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210216174829_smtp_server.yml b/config/metrics/settings/20210216174829_smtp_server.yml
index afee13f5534..c3aa121a826 100644
--- a/config/metrics/settings/20210216174829_smtp_server.yml
+++ b/config/metrics/settings/20210216174829_smtp_server.yml
@@ -8,7 +8,7 @@ product_category: onboarding
 value_type: number
 status: data_available
 time_frame: all
-data_source: ruby
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
index ee3741581b4..f76bd0593b6 100644
--- a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -8,7 +8,7 @@ product_category: web_firewall
 value_type: boolean
 status: deprecated
 time_frame: none
-data_source: database
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/license/20210216175604_edition.yml b/config/metrics/settings/20210216175604_edition.yml
index 6257c7e76c0..58d61ad5d88 100644
--- a/config/metrics/license/20210216175604_edition.yml
+++ b/config/metrics/settings/20210216175604_edition.yml
@@ -1,6 +1,6 @@
 ---
 key_path: edition
-description: Edition of GitLab such as EE, CE, Bronze, Silver, Gold
+description: Edition of GitLab such as EE or CE
 product_section: enablement
 product_stage: enablement
 product_group: group::distribution
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
@@ -16,4 +16,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
+
diff --git a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
index 37b12a982bb..dfc7222ebcf 100644
--- a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
@@ -8,7 +8,7 @@ product_category: global_search
 value_type: boolean
 status: data_available
 time_frame: none
-data_source: ruby
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180314_gitpod_enabled.yml b/config/metrics/settings/20210216180314_gitpod_enabled.yml
index f716f3985f6..0bad75fe3db 100644
--- a/config/metrics/settings/20210216180314_gitpod_enabled.yml
+++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml
@@ -8,7 +8,7 @@ product_category: integrations
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180836_enabled.yml b/config/metrics/settings/20210216180836_enabled.yml
index 1e7e5a226c2..df71de8d4c2 100644
--- a/config/metrics/settings/20210216180836_enabled.yml
+++ b/config/metrics/settings/20210216180836_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180838_enabled.yml b/config/metrics/settings/20210216180838_enabled.yml
index 8524f525917..7bb1135ee08 100644
--- a/config/metrics/settings/20210216180838_enabled.yml
+++ b/config/metrics/settings/20210216180838_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180840_direct_upload.yml b/config/metrics/settings/20210216180840_direct_upload.yml
index 08ef5e1ece1..788d101ba22 100644
--- a/config/metrics/settings/20210216180840_direct_upload.yml
+++ b/config/metrics/settings/20210216180840_direct_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180841_background_upload.yml b/config/metrics/settings/20210216180841_background_upload.yml
index c7b943be3b8..77788a696d0 100644
--- a/config/metrics/settings/20210216180841_background_upload.yml
+++ b/config/metrics/settings/20210216180841_background_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180843_provider.yml b/config/metrics/settings/20210216180843_provider.yml
index 002fb0e7186..c2d684605cb 100644
--- a/config/metrics/counts_all/20210216180843_provider.yml
+++ b/config/metrics/settings/20210216180843_provider.yml
@@ -5,10 +5,10 @@ product_section: enablement
 product_stage: enablement
 product_group: group::memory
 product_category: operational_metrics
-value_type: number
+value_type: string
 status: data_available
 time_frame: all
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180845_enabled.yml b/config/metrics/settings/20210216180845_enabled.yml
index 45148c406dc..9b5c02e3e16 100644
--- a/config/metrics/settings/20210216180845_enabled.yml
+++ b/config/metrics/settings/20210216180845_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180847_enabled.yml b/config/metrics/settings/20210216180847_enabled.yml
index 8323bd9f5ab..5babfc27fbf 100644
--- a/config/metrics/settings/20210216180847_enabled.yml
+++ b/config/metrics/settings/20210216180847_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180849_direct_upload.yml b/config/metrics/settings/20210216180849_direct_upload.yml
index e67b87e0bce..56b17b7b44e 100644
--- a/config/metrics/settings/20210216180849_direct_upload.yml
+++ b/config/metrics/settings/20210216180849_direct_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180851_background_upload.yml b/config/metrics/settings/20210216180851_background_upload.yml
index 058c80a536d..2108d35f4bf 100644
--- a/config/metrics/settings/20210216180851_background_upload.yml
+++ b/config/metrics/settings/20210216180851_background_upload.yml
@@ -9,7 +9,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180852_provider.yml b/config/metrics/settings/20210216180852_provider.yml
index 0b22e1ce412..2d6d48d4be8 100644
--- a/config/metrics/counts_all/20210216180852_provider.yml
+++ b/config/metrics/settings/20210216180852_provider.yml
@@ -5,10 +5,10 @@ product_section: enablement
 product_stage: enablement
 product_group: group::memory
 product_category: operational_metrics
-value_type: number
+value_type: string
 status: data_available
 time_frame: all
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180854_enabled.yml b/config/metrics/settings/20210216180854_enabled.yml
index 40be02cb34a..f61f15622d7 100644
--- a/config/metrics/settings/20210216180854_enabled.yml
+++ b/config/metrics/settings/20210216180854_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180856_enabled.yml b/config/metrics/settings/20210216180856_enabled.yml
index 0646a211e31..1c94354afc7 100644
--- a/config/metrics/settings/20210216180856_enabled.yml
+++ b/config/metrics/settings/20210216180856_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180858_direct_upload.yml b/config/metrics/settings/20210216180858_direct_upload.yml
index d4f14bc35fc..acceccafa5f 100644
--- a/config/metrics/settings/20210216180858_direct_upload.yml
+++ b/config/metrics/settings/20210216180858_direct_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180900_background_upload.yml b/config/metrics/settings/20210216180900_background_upload.yml
index 850c7ae04e2..e9545888d6e 100644
--- a/config/metrics/settings/20210216180900_background_upload.yml
+++ b/config/metrics/settings/20210216180900_background_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180902_provider.yml b/config/metrics/settings/20210216180902_provider.yml
index e5752e274b7..d275a7ea535 100644
--- a/config/metrics/counts_all/20210216180902_provider.yml
+++ b/config/metrics/settings/20210216180902_provider.yml
@@ -5,10 +5,10 @@ product_section: enablement
 product_stage: enablement
 product_group: group::memory
 product_category: operational_metrics
-value_type: number
+value_type: string
 status: data_available
 time_frame: all
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180903_enabled.yml b/config/metrics/settings/20210216180903_enabled.yml
index cc97f1fbacc..5955ed2aa83 100644
--- a/config/metrics/counts_all/20210216180903_enabled.yml
+++ b/config/metrics/settings/20210216180903_enabled.yml
@@ -5,10 +5,10 @@ product_section: enablement
 product_stage: enablement
 product_group: group::memory
 product_category: operational_metrics
-value_type: number
+value_type: string
 status: data_available
 time_frame: all
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180905_enabled.yml b/config/metrics/settings/20210216180905_enabled.yml
index ef22d960a95..475a38bc190 100644
--- a/config/metrics/settings/20210216180905_enabled.yml
+++ b/config/metrics/settings/20210216180905_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180907_direct_upload.yml b/config/metrics/settings/20210216180907_direct_upload.yml
index b34ab887fc6..d6d8d46706b 100644
--- a/config/metrics/settings/20210216180907_direct_upload.yml
+++ b/config/metrics/settings/20210216180907_direct_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180909_background_upload.yml b/config/metrics/settings/20210216180909_background_upload.yml
index 497f7ef7926..3f7317974c0 100644
--- a/config/metrics/settings/20210216180909_background_upload.yml
+++ b/config/metrics/settings/20210216180909_background_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180911_provider.yml b/config/metrics/settings/20210216180911_provider.yml
index 53286df6724..17cbafdd04a 100644
--- a/config/metrics/counts_all/20210216180911_provider.yml
+++ b/config/metrics/settings/20210216180911_provider.yml
@@ -5,10 +5,10 @@ product_section: enablement
 product_stage: enablement
 product_group: group::memory
 product_category: operational_metrics
-value_type: number
+value_type: string
 status: data_available
 time_frame: all
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
index 732a6364a3a..e5b38853325 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180915_enabled.yml b/config/metrics/settings/20210216180915_enabled.yml
index eb78ef5f9e9..d1b2c7a3e91 100644
--- a/config/metrics/settings/20210216180915_enabled.yml
+++ b/config/metrics/settings/20210216180915_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180916_direct_upload.yml b/config/metrics/settings/20210216180916_direct_upload.yml
index 20785f2f8d7..11c70c327b2 100644
--- a/config/metrics/settings/20210216180916_direct_upload.yml
+++ b/config/metrics/settings/20210216180916_direct_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180918_background_upload.yml b/config/metrics/settings/20210216180918_background_upload.yml
index 3ef8daaa685..066fc31a62d 100644
--- a/config/metrics/settings/20210216180918_background_upload.yml
+++ b/config/metrics/settings/20210216180918_background_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180920_provider.yml b/config/metrics/settings/20210216180920_provider.yml
index 133b65f6d51..94f34244840 100644
--- a/config/metrics/counts_all/20210216180920_provider.yml
+++ b/config/metrics/settings/20210216180920_provider.yml
@@ -5,10 +5,10 @@ product_section: enablement
 product_stage: enablement
 product_group: group::memory
 product_category: operational_metrics
-value_type: number
+value_type: string
 status: data_available
 time_frame: all
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216183241_filesystems.yml b/config/metrics/settings/20210216183241_filesystems.yml
index ffb3f0d5cca..3585fda1771 100644
--- a/config/metrics/counts_all/20210216183241_filesystems.yml
+++ b/config/metrics/settings/20210216183241_filesystems.yml
@@ -8,7 +8,7 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/counts_all/20210216183248_pg_system_id.yml b/config/metrics/settings/20210216183248_pg_system_id.yml
index 72d97c5db54..28905c62ce0 100644
--- a/config/metrics/counts_all/20210216183248_pg_system_id.yml
+++ b/config/metrics/settings/20210216183248_pg_system_id.yml
@@ -1,14 +1,14 @@
 ---
 key_path: database.pg_system_id
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: TBD
+product_section: enablement
+product_stage: enablement
+product_group: group::distribution
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210225045628_operating_system.yml b/config/metrics/settings/20210225045628_operating_system.yml
index 0d60bc309b4..41b65a1bd6a 100644
--- a/config/metrics/settings/20210225045628_operating_system.yml
+++ b/config/metrics/settings/20210225045628_operating_system.yml
@@ -10,7 +10,7 @@ status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54778
 time_frame: none
-data_source: ruby
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210321224827_gitaly_apdex.yml b/config/metrics/settings/20210321224827_gitaly_apdex.yml
new file mode 100644
index 00000000000..15db70b6008
--- /dev/null
+++ b/config/metrics/settings/20210321224827_gitaly_apdex.yml
@@ -0,0 +1,20 @@
+---
+key_path: settings.gitaly_apdex
+description: Gitaly application performance
+product_section: dev
+product_stage: create
+product_group: group::gitaly
+product_category: gitaly
+value_type: number
+status: implemented
+milestone: "13.11"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47040
+time_frame: none
+data_source: prometheus
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210323120839_topology.yml b/config/metrics/settings/20210323120839_topology.yml
index 9cc32b75790..5fa9b475472 100644
--- a/config/metrics/settings/20210323120839_topology.yml
+++ b/config/metrics/settings/20210323120839_topology.yml
@@ -18,4 +18,4 @@ tier:
 - free
 - premium
 - ultimate
-object_json_schema: 'config/metrics/objects_schemas/topology_schema.json'
+value_json_schema: 'config/metrics/objects_schemas/topology_schema.json'
diff --git a/config/object_store_settings.rb b/config/object_store_settings.rb
index 938129757f1..8cbb3451a16 100644
--- a/config/object_store_settings.rb
+++ b/config/object_store_settings.rb
@@ -144,6 +144,11 @@ class ObjectStoreSettings
       target_config['remote_directory'] = target_config.delete('bucket')
       target_config['consolidated_settings'] = true
       section['object_store'] = target_config
+      # Settingslogic internally stores data as a Hash, but it also
+      # creates a Settings object for every key. To avoid confusion, we should
+      # update both so that Settings.artifacts and Settings['artifacts'] return
+      # the same result.
+      settings[store_type]['object_store'] = target_config
     end
 
     settings
diff --git a/config/puma.example.development.rb b/config/puma.example.development.rb
index 28c2af3acb3..ad33250011e 100644
--- a/config/puma.example.development.rb
+++ b/config/puma.example.development.rb
@@ -80,14 +80,10 @@ tag 'gitlab-puma-worker'
 worker_timeout 60
 
 # https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput
-if defined?(wait_for_less_busy_worker)
-  wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f
-end
+wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f
 
 # https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork
-if defined?(nakayoshi_fork)
-  nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true'
-end
+nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true'
 
 # Use json formatter
 require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"
diff --git a/config/puma.rb.example b/config/puma.rb.example
index 9fc354a8fe8..f659529f23f 100644
--- a/config/puma.rb.example
+++ b/config/puma.rb.example
@@ -70,14 +70,10 @@ tag 'gitlab-puma-worker'
 worker_timeout 60
 
 # https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput
-if defined?(wait_for_less_busy_worker)
-  wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f
-end
+wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f
 
 # https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork
-if defined?(nakayoshi_fork)
-  nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true'
-end
+nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true'
 
 # Use json formatter
 require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"
diff --git a/config/puma_actioncable.example.development.rb b/config/puma_actioncable.example.development.rb
index d0da3dcd8f2..1e1f09cc601 100644
--- a/config/puma_actioncable.example.development.rb
+++ b/config/puma_actioncable.example.development.rb
@@ -80,14 +80,10 @@ tag 'gitlab-actioncable-puma-worker'
 worker_timeout 60
 
 # https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput
-if defined?(wait_for_less_busy_worker)
-  wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f
-end
+wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f
 
 # https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork
-if defined?(nakayoshi_fork)
-  nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true'
-end
+nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true'
 
 # Use json formatter
 require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"
diff --git a/config/routes.rb b/config/routes.rb
index 1258675df86..3b0370551b9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -51,10 +51,12 @@ Rails.application.routes.draw do
       Gitlab.ee do
         get :trial_getting_started, on: :collection
         get :trial_onboarding_board, on: :collection
+        get :continuous_onboarding_getting_started, on: :collection
       end
     end
 
     resource :experience_level, only: [:show, :update]
+    resources :invites, only: [:new, :create]
 
     Gitlab.ee do
       resources :groups, only: [:new, :create]
@@ -75,6 +77,9 @@ Rails.application.routes.draw do
   # Health check
   get 'health_check(/:checks)' => 'health_check#index', as: :health_check
 
+  # Terraform service discovery
+  get '.well-known/terraform.json' => 'terraform/services#index', as: :terraform_services
+
   # Begin of the /-/ scope.
   # Use this scope for all new global routes.
   scope path: '-' do
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 39d639a70cc..2ba00e3bf66 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -10,11 +10,19 @@ namespace :admin do
       end
     end
 
+    collection do
+      scope '/-/' do
+        get :cohorts
+      end
+    end
+
     member do
       get :projects
       get :keys
       put :block
       put :unblock
+      put :ban
+      put :unban
       put :deactivate
       put :activate
       put :unlock
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 126680a0b44..ef31b639d33 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -52,7 +52,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
 
       resources :applications
 
-      resources :packages_and_registries, only: [:index]
+      resource :packages_and_registries, only: [:show]
     end
 
     resource :variables, only: [:show, :update]
@@ -114,6 +114,17 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
     resources :container_registries, only: [:index, :show], controller: 'registry/repositories'
     resource :dependency_proxy, only: [:show, :update]
     resources :email_campaigns, only: :index
+
+    resources :autocomplete_sources, only: [] do
+      collection do
+        get 'members'
+        get 'issues'
+        get 'merge_requests'
+        get 'labels'
+        get 'commands'
+        get 'milestones'
+      end
+    end
   end
 
   scope(path: '*id',
diff --git a/config/routes/pipelines.rb b/config/routes/pipelines.rb
index 1a74abdeaa1..ef390d7988b 100644
--- a/config/routes/pipelines.rb
+++ b/config/routes/pipelines.rb
@@ -19,6 +19,7 @@ resources :pipelines, only: [:index, :new, :create, :show, :destroy] do
     get :failures
     get :status
     get :test_report
+    get :downloadable_artifacts
   end
 
   resources :stages, only: [], param: :name, controller: 'pipelines/stages' do
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 09b212bc1a2..d62e2f1b2f2 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -129,6 +129,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
               put :revoke
             end
           end
+
+          resource :packages_and_registries, only: [:show]
         end
 
         resources :autocomplete_sources, only: [] do
@@ -265,6 +267,15 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         end
         get '/cycle_analytics', to: redirect('%{namespace_id}/%{project_id}/-/value_stream_analytics')
 
+        namespace :analytics do
+          resource :cycle_analytics, only: :show, path: 'value_stream_analytics'
+          scope module: :cycle_analytics, as: 'cycle_analytics', path: 'value_stream_analytics' do
+            resources :value_streams, only: [:index] do
+              resources :stages, only: [:index]
+            end
+          end
+        end
+
         concerns :clusterable
 
         namespace :serverless do
diff --git a/config/secrets.yml.example b/config/secrets.yml.example
index 6b408ac6031..aadf13d53b2 100644
--- a/config/secrets.yml.example
+++ b/config/secrets.yml.example
@@ -1,7 +1,7 @@
 production:
   # db_key_base is used to encrypt for Variables. Ensure that you don't lose it.
   # If you change or lose this key you will be unable to access variables stored in database.
-  # Make sure the secret is at least 30 characters and all random,
+  # Make sure the secret is at least 32 characters and all random,
   # no regular words or you'll be exposed to dictionary attacks.
   # db_key_base:
 
diff --git a/config/settings.rb b/config/settings.rb
index 3369f2a4480..a88f6d89ce4 100644
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -126,16 +126,18 @@ class Settings < Settingslogic
       File.expand_path(path, Rails.root)
     end
 
-    # Ruby 2.4+ requires passing in the exact required length for OpenSSL keys
-    # (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1).
-    # Previous versions quietly truncated the input.
-    #
-    # Use this when using :per_attribute_iv mode for attr_encrypted.
-    # We have to truncate the string to 32 bytes for a 256-bit cipher.
+    # Don't use this in new code, use attr_encrypted_db_key_base_32 instead!
     def attr_encrypted_db_key_base_truncated
       Gitlab::Application.secrets.db_key_base[0..31]
     end
 
+    # Ruby 2.4+ requires passing in the exact required length for OpenSSL keys
+    # (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1).
+    # Previous versions quietly truncated the input.
+    #
+    # Makes sure the key is exactly 32 bytes long, either by
+    # truncating or right-padding it with ASCII 0s. Use this when
+    # using :per_attribute_iv mode for attr_encrypted.
     def attr_encrypted_db_key_base_32
       Gitlab::Utils.ensure_utf8_size(attr_encrypted_db_key_base, bytes: 32.bytes)
     end
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index c0aab89fd46..02fe21a9e6e 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -56,8 +56,12 @@
   - 1
 - - bulk_imports_entity
   - 1
+- - bulk_imports_export_request
+  - 1
 - - bulk_imports_pipeline
   - 1
+- - bulk_imports_relation_export
+  - 1
 - - chaos
   - 2
 - - chat_notification
@@ -148,8 +152,6 @@
   - 1
 - - geo
   - 1
-- - git_garbage_collect
-  - 1
 - - github_import_advance_stage
   - 1
 - - github_importer
@@ -190,6 +192,10 @@
   - 1
 - - issuable_export_csv
   - 1
+- - issuable_label_links_destroy
+  - 1
+- - issuables_clear_groups_issue_counter
+  - 1
 - - issue_placement
   - 2
 - - issue_rebalancing
@@ -398,6 +404,8 @@
   - 1
 - - upload_checksum
   - 1
+- - users_update_open_issue_count
+  - 1
 - - vulnerabilities_statistics_adjustment
   - 1
 - - vulnerability_exports_export
diff --git a/config/storage.yml b/config/storage.yml
new file mode 100644
index 00000000000..b40240bcc54
--- /dev/null
+++ b/config/storage.yml
@@ -0,0 +1,2 @@
+# This file is created only to be able to run `derailed exec perf:mem` task
+# This task loads the whole Rails application using its own initializers
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 94aa190b77a..db5371a7258 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -1,11 +1,11 @@
 const fs = require('fs');
+const path = require('path');
 
 const SOURCEGRAPH_VERSION = require('@sourcegraph/code-host-integration/package.json').version;
 
 const CompressionPlugin = require('compression-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const glob = require('glob');
-const path = require('path');
 const VueLoaderPlugin = require('vue-loader/lib/plugin');
 const VUE_LOADER_VERSION = require('vue-loader/package.json').version;
 const VUE_VERSION = require('vue/package.json').version;
@@ -188,7 +188,7 @@ module.exports = {
   },
 
   resolve: {
-    extensions: ['.js', '.gql', '.graphql'],
+    extensions: ['.js'],
     alias,
   },
 
@@ -307,11 +307,11 @@ module.exports = {
           chunks: 'initial',
           minChunks: autoEntriesCount * 0.9,
         }),
-        tiptap: {
+        prosemirror: {
           priority: 17,
-          name: 'tiptap',
+          name: 'prosemirror',
           chunks: 'all',
-          test: /[\\/]node_modules[\\/](tiptap|prosemirror)-?\w*[\\/]/,
+          test: /[\\/]node_modules[\\/]prosemirror.*?[\\/]/,
           minChunks: 2,
           reuseExistingChunk: true,
         },
@@ -395,18 +395,6 @@ module.exports = {
     new webpack.ProvidePlugin({
       $: 'jquery',
       jQuery: 'jquery',
-      Popper: ['popper.js', 'default'],
-      Alert: 'exports-loader?Alert!bootstrap/js/dist/alert',
-      Button: 'exports-loader?Button!bootstrap/js/dist/button',
-      Carousel: 'exports-loader?Carousel!bootstrap/js/dist/carousel',
-      Collapse: 'exports-loader?Collapse!bootstrap/js/dist/collapse',
-      Dropdown: 'exports-loader?Dropdown!bootstrap/js/dist/dropdown',
-      Modal: 'exports-loader?Modal!bootstrap/js/dist/modal',
-      Popover: 'exports-loader?Popover!bootstrap/js/dist/popover',
-      Scrollspy: 'exports-loader?Scrollspy!bootstrap/js/dist/scrollspy',
-      Tab: 'exports-loader?Tab!bootstrap/js/dist/tab',
-      Tooltip: 'exports-loader?Tooltip!bootstrap/js/dist/tooltip',
-      Util: 'exports-loader?Util!bootstrap/js/dist/util',
     }),
 
     // if DLLs are enabled, detect whether the DLL exists and create it automatically if necessary
@@ -463,12 +451,14 @@ module.exports = {
       }),
 
     dll &&
-      new CopyWebpackPlugin([
-        {
-          from: dll.cacheFrom,
-          to: dll.cacheTo,
-        },
-      ]),
+      new CopyWebpackPlugin({
+        patterns: [
+          {
+            from: dll.cacheFrom,
+            to: dll.cacheTo,
+          },
+        ],
+      }),
 
     !IS_EE &&
       new webpack.NormalModuleReplacementPlugin(/^ee_component\/(.*)\.vue/, (resource) => {
@@ -479,24 +469,28 @@ module.exports = {
         );
       }),
 
-    new CopyWebpackPlugin([
-      {
-        from: path.join(ROOT_PATH, 'node_modules/pdfjs-dist/cmaps/'),
-        to: path.join(WEBPACK_OUTPUT_PATH, 'cmaps/'),
-      },
-      {
-        from: path.join(ROOT_PATH, 'node_modules', SOURCEGRAPH_PACKAGE, '/'),
-        to: SOURCEGRAPH_OUTPUT_PATH,
-        ignore: ['package.json'],
-      },
-      {
-        from: path.join(
-          ROOT_PATH,
-          'node_modules/@gitlab/visual-review-tools/dist/visual_review_toolbar.js',
-        ),
-        to: WEBPACK_OUTPUT_PATH,
-      },
-    ]),
+    new CopyWebpackPlugin({
+      patterns: [
+        {
+          from: path.join(ROOT_PATH, 'node_modules/pdfjs-dist/cmaps/'),
+          to: path.join(WEBPACK_OUTPUT_PATH, 'cmaps/'),
+        },
+        {
+          from: path.join(ROOT_PATH, 'node_modules', SOURCEGRAPH_PACKAGE, '/'),
+          to: SOURCEGRAPH_OUTPUT_PATH,
+          globOptions: {
+            ignore: ['package.json'],
+          },
+        },
+        {
+          from: path.join(
+            ROOT_PATH,
+            'node_modules/@gitlab/visual-review-tools/dist/visual_review_toolbar.js',
+          ),
+          to: WEBPACK_OUTPUT_PATH,
+        },
+      ],
+    }),
 
     // compression can require a lot of compute time and is disabled in CI
     IS_PRODUCTION && !NO_COMPRESSION && new CompressionPlugin(),