Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

440 files changed, 3340 insertions, 1200 deletions

diff --git a/config/application.rb b/config/application.rb
index e5710edc811..b9792cba793 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -29,6 +29,7 @@ module Gitlab
     require_dependency Rails.root.join('lib/gitlab/middleware/same_site_cookies')
     require_dependency Rails.root.join('lib/gitlab/middleware/handle_ip_spoof_attack_error')
     require_dependency Rails.root.join('lib/gitlab/middleware/handle_malformed_strings')
+    require_dependency Rails.root.join('lib/gitlab/middleware/rack_multipart_tempfile_factory')
     require_dependency Rails.root.join('lib/gitlab/runtime')
 
     # Settings in config/environments/* take precedence over those specified here.
@@ -56,21 +57,29 @@ module Gitlab
 
     config.generators.templates.push("#{config.root}/generator_templates")
 
-    if Gitlab.ee?
-      ee_paths = config.eager_load_paths.each_with_object([]) do |path, memo|
-        ee_path = config.root.join('ee', Pathname.new(path).relative_path_from(config.root))
-        memo << ee_path.to_s
+    load_paths = lambda do |dir:|
+      ext_paths = config.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
 
-      ee_paths << "#{config.root}/ee/app/replicators"
+      ext_paths << "#{config.root}/#{dir}/app/replicators"
 
       # Eager load should load CE first
-      config.eager_load_paths.push(*ee_paths)
-      config.helpers_paths.push "#{config.root}/ee/app/helpers"
+      config.eager_load_paths.push(*ext_paths)
+      config.helpers_paths.push "#{config.root}/#{dir}/app/helpers"
 
-      # Other than Ruby modules we load EE first
-      config.paths['lib/tasks'].unshift "#{config.root}/ee/lib/tasks"
-      config.paths['app/views'].unshift "#{config.root}/ee/app/views"
+      # Other than Ruby modules we load extensions first
+      config.paths['lib/tasks'].unshift "#{config.root}/#{dir}/lib/tasks"
+      config.paths['app/views'].unshift "#{config.root}/#{dir}/app/views"
+    end
+
+    Gitlab.ee do
+      load_paths.call(dir: 'ee')
+    end
+
+    Gitlab.jh do
+      load_paths.call(dir: 'jh')
     end
 
     # Rake tasks ignore the eager loading settings, so we need to set the
@@ -271,6 +280,8 @@ module Gitlab
 
     config.middleware.insert_after ActionDispatch::ActionableExceptions, ::Gitlab::Middleware::HandleMalformedStrings
 
+    config.middleware.insert_after Rack::Sendfile, ::Gitlab::Middleware::RackMultipartTempfileFactory
+
     # Allow access to GitLab API from other domains
     config.middleware.insert_before Warden::Manager, Rack::Cors do
       headers_to_expose = %w[Link X-Total X-Total-Pages X-Per-Page X-Page X-Next-Page X-Prev-Page X-Gitlab-Blob-Id X-Gitlab-Commit-Id X-Gitlab-Content-Sha256 X-Gitlab-Encoding X-Gitlab-File-Name X-Gitlab-File-Path X-Gitlab-Last-Commit-Id X-Gitlab-Ref X-Gitlab-Size]
diff --git a/config/bullet.yml b/config/bullet.yml
new file mode 100644
index 00000000000..18eaa778aad
--- /dev/null
+++ b/config/bullet.yml
@@ -0,0 +1,44 @@
+---
+
+exclusions:
+  # See https://github.com/flyerhzm/bullet#configuration for exclusion formats
+  # Example usage:
+  #
+  # paths with method name(recommended use):
+  #
+  # example_path_with_method_exclusion_name:
+  #   merge_request: 'some merge request link for context'
+  #   exact_file_name: true
+  #   exclude:
+  #     - 'some_ruby_file_name.rb'
+  #     - 'method_name_inside_the_file_above'
+  #
+  # path or pattern only to file(fuzzy, not recommended):
+  #
+  # example_path_with_exact_file_name:
+  #   merge_request: 'some merge request link for context'
+  #   exact_file_name: true
+  #   exclude:
+  #     - 'some_ruby_file_name.rb'
+  #
+  # example_path_with_pattern:
+  #   merge_request: 'some merge request link for context'
+  #   exact_file_name: false
+  #   exclude:
+  #     - 'file_pattern'
+  #
+  # path with line numbers(extremely fragile, not recommended):
+  #
+  # example_path_with_line_range:
+  #   merge_request: 'some merge request link for context'
+  #   exact_file_name: true
+  #   exclude:
+  #     - 'some_ruby_file_name.rb'
+  #     - 5..10
+  #
+  group_member_presenter_managing_group:
+    merge_request: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58927'
+    path_with_method: true
+    exclude:
+      - 'ee/app/presenters/ee/group_member_presenter.rb'
+      - 'group_managed_account?'
diff --git a/config/feature_flags/development/allow_force_push_to_protected_branches.yml b/config/feature_flags/development/allow_force_push_to_protected_branches.yml
index 987c7d4bb7b..632e2ad0ccd 100644
--- a/config/feature_flags/development/allow_force_push_to_protected_branches.yml
+++ b/config/feature_flags/development/allow_force_push_to_protected_branches.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323431
 milestone: '13.10'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/avatar_cache_for_email.yml b/config/feature_flags/development/api_caching_tags.yml
index d0285b5bb0f..142291bf975 100644
--- a/config/feature_flags/development/avatar_cache_for_email.yml
+++ b/config/feature_flags/development/api_caching_tags.yml
@@ -1,7 +1,7 @@
 ---
-name: avatar_cache_for_email
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55184
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323185
+name: api_caching_tags
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54975
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/324391
 milestone: '13.10'
 type: development
 group: group::source code
diff --git a/config/feature_flags/development/async_handle_merge_request_assignees_change.yml b/config/feature_flags/development/async_handle_merge_request_assignees_change.yml
new file mode 100644
index 00000000000..b44ccb1bd6e
--- /dev/null
+++ b/config/feature_flags/development/async_handle_merge_request_assignees_change.yml
@@ -0,0 +1,8 @@
+---
+name: async_handle_merge_request_assignees_change
+introduced_by_url:
+rollout_issue_url:
+milestone: '13.11'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/board_new_list.yml b/config/feature_flags/development/board_new_list.yml
index e80da8c554f..7d755dd6689 100644
--- a/config/feature_flags/development/board_new_list.yml
+++ b/config/feature_flags/development/board_new_list.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/299366
 milestone: '13.8'
 type: development
 group: group::project management
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/cached_sidebar_merge_requests_count.yml b/config/feature_flags/development/cached_sidebar_merge_requests_count.yml
new file mode 100644
index 00000000000..f542ba6323c
--- /dev/null
+++ b/config/feature_flags/development/cached_sidebar_merge_requests_count.yml
@@ -0,0 +1,8 @@
+---
+name: cached_sidebar_merge_requests_count
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55971
+rollout_issue_url:
+milestone: '13.11'
+type: development
+group: group::product planning
+default_enabled: true
diff --git a/config/feature_flags/development/cached_sidebar_open_issues_count.yml b/config/feature_flags/development/cached_sidebar_open_epics_count.yml
index 4a9538046b8..265f3135b48 100644
--- a/config/feature_flags/development/cached_sidebar_open_issues_count.yml
+++ b/config/feature_flags/development/cached_sidebar_open_epics_count.yml
@@ -1,8 +1,8 @@
 ---
-name: cached_sidebar_open_issues_count
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49739
+name: cached_sidebar_open_epics_count
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58064
 rollout_issue_url:
-milestone: '13.8'
+milestone: '13.11'
 type: development
 group: group::product planning
 default_enabled: true
diff --git a/config/feature_flags/development/resource_access_token_feature.yml b/config/feature_flags/development/cascading_namespace_settings.yml
index 536502b7ca0..d638f457515 100644
--- a/config/feature_flags/development/resource_access_token_feature.yml
+++ b/config/feature_flags/development/cascading_namespace_settings.yml
@@ -1,8 +1,8 @@
 ---
-name: resource_access_token_feature
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29622
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235765
-milestone: '13.0'
+name: cascading_namespace_settings
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55678
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327230
+milestone: '13.11'
 type: development
 group: group::access
 default_enabled: true
diff --git a/config/feature_flags/development/check_maven_path_first.yml b/config/feature_flags/development/check_maven_path_first.yml
new file mode 100644
index 00000000000..b871bf8902d
--- /dev/null
+++ b/config/feature_flags/development/check_maven_path_first.yml
@@ -0,0 +1,8 @@
+---
+name: check_maven_path_first
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59241
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327487
+milestone: '13.11'
+type: development
+group: group::package
+default_enabled: false
diff --git a/config/feature_flags/development/check_mergeability_async_in_widget.yml b/config/feature_flags/development/check_mergeability_async_in_widget.yml
new file mode 100644
index 00000000000..ff8116c3a65
--- /dev/null
+++ b/config/feature_flags/development/check_mergeability_async_in_widget.yml
@@ -0,0 +1,8 @@
+---
+name: check_mergeability_async_in_widget
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58178
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326567
+milestone: '13.11'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/ci_external_validation_service.yml b/config/feature_flags/development/ci_external_validation_service.yml
new file mode 100644
index 00000000000..9df770d87e5
--- /dev/null
+++ b/config/feature_flags/development/ci_external_validation_service.yml
@@ -0,0 +1,8 @@
+---
+name: ci_external_validation_service
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56856
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323935
+milestone: '13.11'
+type: development
+group: group::continuous integration
+default_enabled: false
diff --git a/config/feature_flags/development/ci_needs_optional.yml b/config/feature_flags/development/ci_needs_optional.yml
index fcbe9bf6106..eacb0ab6d51 100644
--- a/config/feature_flags/development/ci_needs_optional.yml
+++ b/config/feature_flags/development/ci_needs_optional.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323891
 milestone: '13.10'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/jira_issues_list.yml b/config/feature_flags/development/ci_no_empty_groups.yml
index 081daf0281e..ef7d6459a5a 100644
--- a/config/feature_flags/development/jira_issues_list.yml
+++ b/config/feature_flags/development/ci_no_empty_groups.yml
@@ -1,8 +1,8 @@
 ---
-name: jira_issues_list
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45678
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/273726
-milestone: '13.6'
+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
+milestone: '13.11'
 type: development
-group: group::ecosystem
+group: group::verify
 default_enabled: false
diff --git a/config/feature_flags/development/ci_preload_runner_tags.yml b/config/feature_flags/development/ci_preload_runner_tags.yml
index d91bd788d41..8d3ab2a95d6 100644
--- a/config/feature_flags/development/ci_preload_runner_tags.yml
+++ b/config/feature_flags/development/ci_preload_runner_tags.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323243
 milestone: '13.10'
 type: development
 group: group::memory
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_reduce_queries_when_ticking_runner_queue.yml b/config/feature_flags/development/ci_reduce_queries_when_ticking_runner_queue.yml
index 92acb98969b..56f5afa9ed0 100644
--- a/config/feature_flags/development/ci_reduce_queries_when_ticking_runner_queue.yml
+++ b/config/feature_flags/development/ci_reduce_queries_when_ticking_runner_queue.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323328
 milestone: '13.10'
 type: development
 group: group::continuous integration
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_register_job_service_one_by_one.yml b/config/feature_flags/development/ci_register_job_service_one_by_one.yml
index 7ce58d06bdc..8f691a01605 100644
--- a/config/feature_flags/development/ci_register_job_service_one_by_one.yml
+++ b/config/feature_flags/development/ci_register_job_service_one_by_one.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323177
 milestone: '13.10'
 type: development
 group: group::memory
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_instance_variables_ui.yml b/config/feature_flags/development/ci_runner_builds_queue_on_replicas.yml
index 73bc0346818..7e930ce5a10 100644
--- a/config/feature_flags/development/ci_instance_variables_ui.yml
+++ b/config/feature_flags/development/ci_runner_builds_queue_on_replicas.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_instance_variables_ui
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33510
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/299879
-milestone: '13.1'
+name: ci_runner_builds_queue_on_replicas
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56849
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325723
+milestone: '13.10'
 type: development
 group: group::continuous integration
 default_enabled: true
diff --git a/config/feature_flags/development/ci_commit_pipeline_mini_graph_vue.yml b/config/feature_flags/development/ci_wildcard_file_paths.yml
index 22a58977f0f..2d21fc8fa41 100644
--- a/config/feature_flags/development/ci_commit_pipeline_mini_graph_vue.yml
+++ b/config/feature_flags/development/ci_wildcard_file_paths.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_commit_pipeline_mini_graph_vue
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55363
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323356
-milestone: '13.10'
+name: ci_wildcard_file_paths
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58999
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327315
+milestone: '13.11'
 type: development
 group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/ci_trigger_payload_into_pipeline.yml b/config/feature_flags/development/ci_workflow_rules_variables.yml
index 2130c6151e8..8915d109c83 100644
--- a/config/feature_flags/development/ci_trigger_payload_into_pipeline.yml
+++ b/config/feature_flags/development/ci_workflow_rules_variables.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_trigger_payload_into_pipeline
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53837
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321027
-milestone: '13.9'
+name: ci_workflow_rules_variables
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52085
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300997
+milestone: '13.11'
 type: development
 group: group::pipeline authoring
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/code_review_async_pipeline_creation.yml b/config/feature_flags/development/code_review_async_pipeline_creation.yml
new file mode 100644
index 00000000000..d0e5a3286aa
--- /dev/null
+++ b/config/feature_flags/development/code_review_async_pipeline_creation.yml
@@ -0,0 +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'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/attachment_with_filename.yml b/config/feature_flags/development/combined_menu.yml
index 8d3a96404ef..84ae04893fd 100644
--- a/config/feature_flags/development/attachment_with_filename.yml
+++ b/config/feature_flags/development/combined_menu.yml
@@ -1,7 +1,7 @@
 ---
-name: attachment_with_filename
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55066
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323714
+name: combined_menu
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56249
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321904
 milestone: '13.10'
 type: development
 group: group::editor
diff --git a/config/feature_flags/development/container_registry_expiration_policies_loopless.yml b/config/feature_flags/development/container_registry_expiration_policies_loopless.yml
new file mode 100644
index 00000000000..5c581151d0e
--- /dev/null
+++ b/config/feature_flags/development/container_registry_expiration_policies_loopless.yml
@@ -0,0 +1,8 @@
+---
+name: container_registry_expiration_policies_loopless
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56962
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325273
+milestone: '13.11'
+type: development
+group: group::package
+default_enabled: false
diff --git a/config/feature_flags/development/remove_resolve_note.yml b/config/feature_flags/development/destroy_issuable_todos_async.yml
index 008a469e16d..c39e551bdd9 100644
--- a/config/feature_flags/development/remove_resolve_note.yml
+++ b/config/feature_flags/development/destroy_issuable_todos_async.yml
@@ -1,8 +1,8 @@
 ---
-name: remove_resolve_note
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45549
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/320756
-milestone: '13.6'
+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'
 type: development
 group: group::code review
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/scoped_group_variables.yml b/config/feature_flags/development/diff_line_syntax_highlighting.yml
index bdeb453abb9..3244dad6c24 100644
--- a/config/feature_flags/development/scoped_group_variables.yml
+++ b/config/feature_flags/development/diff_line_syntax_highlighting.yml
@@ -1,8 +1,8 @@
 ---
-name: scoped_group_variables
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55256
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323298
+name: diff_line_syntax_highlighting
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56108
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/324159
 milestone: '13.10'
 type: development
-group: group::configure
+group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/dynamic_nonce_creation.yml b/config/feature_flags/development/dynamic_nonce_creation.yml
deleted file mode 100644
index b135f288554..00000000000
--- a/config/feature_flags/development/dynamic_nonce_creation.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: dynamic_nonce_creation
-introduced_by_url:
-rollout_issue_url:
-milestone: '13.9'
-type: development
-group: group::manage
-default_enabled: false
diff --git a/config/feature_flags/development/enforce_max_attachment_size_upload_api.yml b/config/feature_flags/development/enforce_max_attachment_size_upload_api.yml
new file mode 100644
index 00000000000..f8e70d05939
--- /dev/null
+++ b/config/feature_flags/development/enforce_max_attachment_size_upload_api.yml
@@ -0,0 +1,8 @@
+---
+name: enforce_max_attachment_size_upload_api
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57250
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325787
+milestone: '13.11'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/erase_traces_from_already_archived_jobs_when_archiving_again.yml b/config/feature_flags/development/erase_traces_from_already_archived_jobs_when_archiving_again.yml
new file mode 100644
index 00000000000..ed6d86df37b
--- /dev/null
+++ b/config/feature_flags/development/erase_traces_from_already_archived_jobs_when_archiving_again.yml
@@ -0,0 +1,8 @@
+---
+name: erase_traces_from_already_archived_jobs_when_archiving_again
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56353
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326679
+milestone: "13.11"
+type: development
+group: group::continuous integration
+default_enabled: true
diff --git a/config/feature_flags/development/cluster_agent_list.yml b/config/feature_flags/development/geo_pipeline_artifact_replication.yml
index 2c49950620d..9d5bbf60401 100644
--- a/config/feature_flags/development/cluster_agent_list.yml
+++ b/config/feature_flags/development/geo_pipeline_artifact_replication.yml
@@ -1,8 +1,8 @@
 ---
-name: cluster_agent_list
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42115
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/249596
-milestone: '13.5'
+name: geo_pipeline_artifact_replication
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57741
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326228
+milestone: '13.11'
 type: development
-group: group::configure
+group: group::geo
 default_enabled: true
diff --git a/config/feature_flags/development/gitaly_find_file.yml b/config/feature_flags/development/gitaly_replace_wiki_delete_page.yml
index 8d0bc0c5b53..40100bb2fe6 100644
--- a/config/feature_flags/development/gitaly_find_file.yml
+++ b/config/feature_flags/development/gitaly_replace_wiki_delete_page.yml
@@ -1,6 +1,6 @@
 ---
-name: gitaly_find_file
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56321
+name: gitaly_replace_wiki_delete_page
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56495
 rollout_issue_url:
 milestone: '13.10'
 type: development
diff --git a/config/feature_flags/development/gitlab_ci_builds_queue_limit.yml b/config/feature_flags/development/gitlab_ci_builds_queue_limit.yml
index 42310def889..cef1fc98f52 100644
--- a/config/feature_flags/development/gitlab_ci_builds_queue_limit.yml
+++ b/config/feature_flags/development/gitlab_ci_builds_queue_limit.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323201
 milestone: '13.10'
 type: development
 group: group::continuous integration
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/new_pipelines_table.yml b/config/feature_flags/development/gldropdown_tags.yml
index e6148f30f96..704f276ac37 100644
--- a/config/feature_flags/development/new_pipelines_table.yml
+++ b/config/feature_flags/development/gldropdown_tags.yml
@@ -1,8 +1,8 @@
 ---
-name: new_pipelines_table
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54958
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/322599
-milestone: '13.10'
+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'
 type: development
 group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/graphql_individual_release_page.yml b/config/feature_flags/development/graphql_individual_release_page.yml
deleted file mode 100644
index 8cf13ca4854..00000000000
--- a/config/feature_flags/development/graphql_individual_release_page.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: graphql_individual_release_page
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44779
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/263522
-milestone: '13.5'
-type: development
-group: group::release
-default_enabled: true
diff --git a/config/feature_flags/development/graphql_pipeline_details.yml b/config/feature_flags/development/graphql_pipeline_details.yml
index c6d03850f0e..55cf5caa332 100644
--- a/config/feature_flags/development/graphql_pipeline_details.yml
+++ b/config/feature_flags/development/graphql_pipeline_details.yml
@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46380
 rollout_issue_url:
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/infrastructure_registry_page.yml b/config/feature_flags/development/infrastructure_registry_page.yml
new file mode 100644
index 00000000000..fcb34f9d05b
--- /dev/null
+++ b/config/feature_flags/development/infrastructure_registry_page.yml
@@ -0,0 +1,8 @@
+---
+name: infrastructure_registry_page
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57338
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326460
+milestone: '13.11'
+type: development
+group: group::package
+default_enabled: false
diff --git a/config/feature_flags/development/inherited_issuable_templates.yml b/config/feature_flags/development/inherited_issuable_templates.yml
index fb322e9468a..403361ff784 100644
--- a/config/feature_flags/development/inherited_issuable_templates.yml
+++ b/config/feature_flags/development/inherited_issuable_templates.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321247
 milestone: '13.9'
 type: development
 group: group::project management
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/add_issues_button.yml b/config/feature_flags/development/issue_assignees_widget.yml
index 12a6ef61bba..5c9b7df941f 100644
--- a/config/feature_flags/development/add_issues_button.yml
+++ b/config/feature_flags/development/issue_assignees_widget.yml
@@ -1,8 +1,8 @@
 ---
-name: add_issues_button
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47898
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292803
-milestone: '13.6'
+name: issue_assignees_widget
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59620/
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328185
+milestone: '13.11'
 type: development
 group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/jira_issues_show_integration.yml b/config/feature_flags/development/jira_issues_show_integration.yml
deleted file mode 100644
index dd89ace22be..00000000000
--- a/config/feature_flags/development/jira_issues_show_integration.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: jira_issues_show_integration
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52446
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/299832
-milestone: '13.9'
-type: development
-group: group::ecosystem
-default_enabled: false
diff --git a/config/feature_flags/development/jobs_table_vue.yml b/config/feature_flags/development/jobs_table_vue.yml
new file mode 100644
index 00000000000..ef6fda61736
--- /dev/null
+++ b/config/feature_flags/development/jobs_table_vue.yml
@@ -0,0 +1,8 @@
+---
+name: jobs_table_vue
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57155
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327500
+milestone: '13.11'
+type: development
+group: group::continuous integration
+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
new file mode 100644
index 00000000000..f8b589c0a4f
--- /dev/null
+++ b/config/feature_flags/development/lfs_integrity_inspect_quarantined_objects.yml
@@ -0,0 +1,8 @@
+---
+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/load_balancing_atomic_replica.yml b/config/feature_flags/development/load_balancing_atomic_replica.yml
new file mode 100644
index 00000000000..fb0707849d4
--- /dev/null
+++ b/config/feature_flags/development/load_balancing_atomic_replica.yml
@@ -0,0 +1,8 @@
+---
+name: load_balancing_atomic_replica
+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
diff --git a/config/feature_flags/development/load_balancing_for_build_hooks_worker.yml b/config/feature_flags/development/load_balancing_for_build_hooks_worker.yml
new file mode 100644
index 00000000000..41c066c4de9
--- /dev/null
+++ b/config/feature_flags/development/load_balancing_for_build_hooks_worker.yml
@@ -0,0 +1,8 @@
+---
+name: load_balancing_for_build_hooks_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57575
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326095
+milestone: '13.11'
+type: development
+group: group::memory
+default_enabled: false
diff --git a/config/feature_flags/development/load_balancing_for_bulk_cron_workers.yml b/config/feature_flags/development/load_balancing_for_bulk_cron_workers.yml
new file mode 100644
index 00000000000..d0a3ee51f0c
--- /dev/null
+++ b/config/feature_flags/development/load_balancing_for_bulk_cron_workers.yml
@@ -0,0 +1,8 @@
+---
+name: load_balancing_for_bulk_cron_workers
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58345
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326721
+milestone: '13.11'
+type: development
+group: group::global search
+default_enabled: false
diff --git a/config/feature_flags/development/merge_request_cached_pipeline_serializer.yml b/config/feature_flags/development/longer_count_cache_validity.yml
index 0cce0bbf3ba..380eaafac44 100644
--- a/config/feature_flags/development/merge_request_cached_pipeline_serializer.yml
+++ b/config/feature_flags/development/longer_count_cache_validity.yml
@@ -1,8 +1,8 @@
 ---
-name: merge_request_cached_pipeline_serializer
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38273
+name: longer_count_cache_validity
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57122
 rollout_issue_url: 
-milestone: '13.5'
+milestone: '13.11'
 type: development
-group: group::code review
+group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/loose_index_scan_for_distinct_values.yml b/config/feature_flags/development/loose_index_scan_for_distinct_values.yml
new file mode 100644
index 00000000000..84f693d9247
--- /dev/null
+++ b/config/feature_flags/development/loose_index_scan_for_distinct_values.yml
@@ -0,0 +1,8 @@
+---
+name: loose_index_scan_for_distinct_values
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55985
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/324210
+milestone: '13.10'
+type: development
+group: group::optimize
+default_enabled: false
diff --git a/config/feature_flags/development/value_stream_analytics_extended_form.yml b/config/feature_flags/development/maven_metadata_by_path_with_optimization_fence.yml
index f74c85309c1..7b55cde4998 100644
--- a/config/feature_flags/development/value_stream_analytics_extended_form.yml
+++ b/config/feature_flags/development/maven_metadata_by_path_with_optimization_fence.yml
@@ -1,8 +1,8 @@
 ---
-name: value_stream_analytics_extended_form
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50229
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/294190
-milestone: '13.7'
+name: maven_metadata_by_path_with_optimization_fence
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57041
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325460
+milestone: '13.11'
 type: development
 group: group::optimize
 default_enabled: true
diff --git a/config/feature_flags/development/maven_packages_group_level_improvements.yml b/config/feature_flags/development/maven_packages_group_level_improvements.yml
new file mode 100644
index 00000000000..8dfd5ab0f8b
--- /dev/null
+++ b/config/feature_flags/development/maven_packages_group_level_improvements.yml
@@ -0,0 +1,8 @@
+---
+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_request_cached_merge_pipeline_serializer.yml b/config/feature_flags/development/merge_request_cached_merge_pipeline_serializer.yml
new file mode 100644
index 00000000000..506e59f001b
--- /dev/null
+++ b/config/feature_flags/development/merge_request_cached_merge_pipeline_serializer.yml
@@ -0,0 +1,8 @@
+---
+name: merge_request_cached_merge_pipeline_serializer
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57827
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326317
+milestone: '13.11'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/migrate_delayed_project_removal.yml b/config/feature_flags/development/migrate_delayed_project_removal.yml
deleted file mode 100644
index 2d4a7ef762e..00000000000
--- a/config/feature_flags/development/migrate_delayed_project_removal.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: migrate_delayed_project_removal
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53916
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300207
-milestone: '13.9'
-type: development
-group: group::access
-default_enabled: true
diff --git a/config/feature_flags/development/multiple_cache_per_job.yml b/config/feature_flags/development/multiple_cache_per_job.yml
index d06fc7a6f89..f65354cce2c 100644
--- a/config/feature_flags/development/multiple_cache_per_job.yml
+++ b/config/feature_flags/development/multiple_cache_per_job.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321877
 milestone: '13.10'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/notification_setting_recipient_refactor.yml b/config/feature_flags/development/notification_setting_recipient_refactor.yml
new file mode 100644
index 00000000000..7379fe42166
--- /dev/null
+++ b/config/feature_flags/development/notification_setting_recipient_refactor.yml
@@ -0,0 +1,8 @@
+---
+name: notification_setting_recipient_refactor
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57688
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327303
+milestone: '13.11'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/search_settings_in_page.yml b/config/feature_flags/development/other_storage_tab.yml
index 26db77ebdb7..8ce4848f98b 100644
--- a/config/feature_flags/development/search_settings_in_page.yml
+++ b/config/feature_flags/development/other_storage_tab.yml
@@ -1,8 +1,8 @@
 ---
-name: search_settings_in_page
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50207
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/294025
-milestone: '13.7'
+name: other_storage_tab
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57121
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325967
+milestone: '13.11'
 type: development
-group: group::editor
+group: group::fulfillment
 default_enabled: false
diff --git a/config/feature_flags/development/packages_finder_helper_deploy_token.yml b/config/feature_flags/development/packages_finder_helper_deploy_token.yml
new file mode 100644
index 00000000000..fcc73cafd64
--- /dev/null
+++ b/config/feature_flags/development/packages_finder_helper_deploy_token.yml
@@ -0,0 +1,8 @@
+---
+name: packages_finder_helper_deploy_token
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58497
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326808
+milestone: '13.11'
+type: development
+group: group::package
+default_enabled: false
diff --git a/config/feature_flags/development/pages_serve_from_migrated_zip.yml b/config/feature_flags/development/pages_serve_from_migrated_zip.yml
deleted file mode 100644
index 2912beb3985..00000000000
--- a/config/feature_flags/development/pages_serve_from_migrated_zip.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: pages_serve_from_migrated_zip
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52573
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300021
-milestone: '13.9'
-type: development
-group: group::release
-default_enabled: true
diff --git a/config/feature_flags/development/periodic_project_authorization_update_via_replica.yml b/config/feature_flags/development/periodic_project_authorization_update_via_replica.yml
new file mode 100644
index 00000000000..abbc3faeb3a
--- /dev/null
+++ b/config/feature_flags/development/periodic_project_authorization_update_via_replica.yml
@@ -0,0 +1,8 @@
+---
+name: periodic_project_authorization_update_via_replica
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58752
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327092
+milestone: '13.11'
+type: development
+group: group::access
+default_enabled: false
diff --git a/config/feature_flags/development/phabricator_import.yml b/config/feature_flags/development/phabricator_import.yml
index 264988e8006..5340caef140 100644
--- a/config/feature_flags/development/phabricator_import.yml
+++ b/config/feature_flags/development/phabricator_import.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/groups/gitlab-org/-/epics/1197
 milestone: '12.0'
 type: development
 group: group::import
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/pick_into_project.yml b/config/feature_flags/development/pick_into_project.yml
index c180133b86f..fc28527d5a3 100644
--- a/config/feature_flags/development/pick_into_project.yml
+++ b/config/feature_flags/development/pick_into_project.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/324154
 milestone: '13.10'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/pipeline_editor_branch_switcher.yml b/config/feature_flags/development/pipeline_editor_branch_switcher.yml
new file mode 100644
index 00000000000..4ba6c8f94fd
--- /dev/null
+++ b/config/feature_flags/development/pipeline_editor_branch_switcher.yml
@@ -0,0 +1,8 @@
+---
+name: pipeline_editor_branch_switcher
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57562
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326189
+milestone: '13.11'
+type: development
+group: group::pipeline authoring
+default_enabled: false
diff --git a/config/feature_flags/development/pipeline_editor_empty_state_action.yml b/config/feature_flags/development/pipeline_editor_empty_state_action.yml
index a17f3c0363b..870aeb14932 100644
--- a/config/feature_flags/development/pipeline_editor_empty_state_action.yml
+++ b/config/feature_flags/development/pipeline_editor_empty_state_action.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323229
 milestone: '13.10'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/skip_dag_manual_and_delayed_jobs.yml b/config/feature_flags/development/pipeline_filter_jobs.yml
index 640be201868..6fb989a6815 100644
--- a/config/feature_flags/development/skip_dag_manual_and_delayed_jobs.yml
+++ b/config/feature_flags/development/pipeline_filter_jobs.yml
@@ -1,8 +1,8 @@
 ---
-name: skip_dag_manual_and_delayed_jobs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50765
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/297240
-milestone: '13.8'
+name: pipeline_filter_jobs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57142
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325693
+milestone: '13.11'
 type: development
 group: group::pipeline authoring
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/pipeline_graph_layers_view.yml b/config/feature_flags/development/pipeline_graph_layers_view.yml
new file mode 100644
index 00000000000..fae3e118226
--- /dev/null
+++ b/config/feature_flags/development/pipeline_graph_layers_view.yml
@@ -0,0 +1,8 @@
+---
+name: pipeline_graph_layers_view
+introduced_by_url:
+rollout_issue_url:
+milestone: '13.11'
+type: development
+group: group::pipeline authoring
+default_enabled: false
diff --git a/config/feature_flags/development/pipeline_status_for_pipeline_editor.yml b/config/feature_flags/development/pipeline_status_for_pipeline_editor.yml
index 886f8f0f7e6..a24d9423269 100644
--- a/config/feature_flags/development/pipeline_status_for_pipeline_editor.yml
+++ b/config/feature_flags/development/pipeline_status_for_pipeline_editor.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321518
 milestone: '13.10'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/preload_associations_jobs_request_api_endpoint.yml b/config/feature_flags/development/preload_associations_jobs_request_api_endpoint.yml
new file mode 100644
index 00000000000..92f63808bd8
--- /dev/null
+++ b/config/feature_flags/development/preload_associations_jobs_request_api_endpoint.yml
@@ -0,0 +1,8 @@
+---
+name: preload_associations_jobs_request_api_endpoint
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57694
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326477
+milestone: "13.11"
+type: development
+group: group::continuous integration
+default_enabled: true
diff --git a/config/feature_flags/development/product_intelligence_metrics_names_suggestions.yml b/config/feature_flags/development/product_intelligence_metrics_names_suggestions.yml
deleted file mode 100644
index 6831dcdacd5..00000000000
--- a/config/feature_flags/development/product_intelligence_metrics_names_suggestions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: product_intelligence_metrics_names_suggestions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55733
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323460
-milestone: '13.10'
-type: development
-group: group::product intelligence
-default_enabled: false
diff --git a/config/feature_flags/development/gitlab_org_sitemap.yml b/config/feature_flags/development/project_sidebar_refactor.yml
index e0f10124d58..88cca9d8d13 100644
--- a/config/feature_flags/development/gitlab_org_sitemap.yml
+++ b/config/feature_flags/development/project_sidebar_refactor.yml
@@ -1,8 +1,8 @@
 ---
-name: gitlab_org_sitemap
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46661
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276915
-milestone: '13.6'
+name: project_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'
 type: development
 group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/projects_post_creation_worker.yml b/config/feature_flags/development/projects_post_creation_worker.yml
new file mode 100644
index 00000000000..5d07e71f907
--- /dev/null
+++ b/config/feature_flags/development/projects_post_creation_worker.yml
@@ -0,0 +1,8 @@
+---
+name: projects_post_creation_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58119
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326665
+milestone: '13.11'
+type: development
+group: group::source code
+default_enabled: true
diff --git a/config/feature_flags/development/recursive_namespace_lookup_as_inner_join.yml b/config/feature_flags/development/recursive_namespace_lookup_as_inner_join.yml
deleted file mode 100644
index c28e553f23e..00000000000
--- a/config/feature_flags/development/recursive_namespace_lookup_as_inner_join.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: recursive_namespace_lookup_as_inner_join
-introduced_by_url:
-rollout_issue_url:
-milestone: '13.10'
-type: development
-group: group::optimize
-default_enabled: false
diff --git a/config/feature_flags/development/refactor_blob_viewer.yml b/config/feature_flags/development/refactor_blob_viewer.yml
new file mode 100644
index 00000000000..231e2684023
--- /dev/null
+++ b/config/feature_flags/development/refactor_blob_viewer.yml
@@ -0,0 +1,8 @@
+---
+name: refactor_blob_viewer
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57326
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/324351
+milestone: '13.11'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/batch_suggestions.yml b/config/feature_flags/development/reject_unsigned_commits_by_gitlab.yml
index 6a13094f0ab..93c0026d59d 100644
--- a/config/feature_flags/development/batch_suggestions.yml
+++ b/config/feature_flags/development/reject_unsigned_commits_by_gitlab.yml
@@ -1,8 +1,8 @@
 ---
-name: batch_suggestions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34782
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/320755
-milestone: '13.1'
+name: reject_unsigned_commits_by_gitlab
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58453
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326775
+milestone: '13.11'
 type: development
-group: group::code review
+group: group::editor
 default_enabled: true
diff --git a/config/feature_flags/development/resolve_merge_request_todos_async.yml b/config/feature_flags/development/resolve_merge_request_todos_async.yml
new file mode 100644
index 00000000000..db19e439994
--- /dev/null
+++ b/config/feature_flags/development/resolve_merge_request_todos_async.yml
@@ -0,0 +1,8 @@
+---
+name: resolve_merge_request_todos_async
+introduced_by_url:
+rollout_issue_url:
+milestone: '13.11'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/runner_detailed_view_vue_ui.yml b/config/feature_flags/development/runner_detailed_view_vue_ui.yml
new file mode 100644
index 00000000000..d2b07bd2140
--- /dev/null
+++ b/config/feature_flags/development/runner_detailed_view_vue_ui.yml
@@ -0,0 +1,8 @@
+---
+name: runner_detailed_view_vue_ui
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57256
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325737
+milestone: '13.11'
+type: development
+group: group::runner
+default_enabled: false
diff --git a/config/feature_flags/development/runners_cached_states.yml b/config/feature_flags/development/runners_cached_states.yml
new file mode 100644
index 00000000000..e7ea63be1f6
--- /dev/null
+++ b/config/feature_flags/development/runners_cached_states.yml
@@ -0,0 +1,8 @@
+---
+name: runners_cached_states
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57367
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326989
+milestone: '13.11'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/security_dast_site_profiles_additional_fields.yml b/config/feature_flags/development/security_dast_site_profiles_additional_fields.yml
index 0ab96f16547..ef4d1cb3bfe 100644
--- a/config/feature_flags/development/security_dast_site_profiles_additional_fields.yml
+++ b/config/feature_flags/development/security_dast_site_profiles_additional_fields.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292897
 milestone: '13.7'
 type: development
 group: group::dynamic analysis
-default_enabled: false
+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
new file mode 100644
index 00000000000..a92e761d3ce
--- /dev/null
+++ b/config/feature_flags/development/security_dast_site_profiles_api_option.yml
@@ -0,0 +1,8 @@
+---
+name: security_dast_site_profiles_api_option
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58723
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325130
+milestone: '13.12'
+type: development
+group: group::dynamic analysis
+default_enabled: false
diff --git a/config/feature_flags/development/sentry_processors_before_send.yml b/config/feature_flags/development/sentry_processors_before_send.yml
new file mode 100644
index 00000000000..19e88699b66
--- /dev/null
+++ b/config/feature_flags/development/sentry_processors_before_send.yml
@@ -0,0 +1,8 @@
+---
+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/pages_migration_mark_as_not_deployed.yml b/config/feature_flags/development/skip_pages_deploy_to_legacy_storage.yml
index f8b28785a2d..a324a6e5ab1 100644
--- a/config/feature_flags/development/pages_migration_mark_as_not_deployed.yml
+++ b/config/feature_flags/development/skip_pages_deploy_to_legacy_storage.yml
@@ -1,8 +1,8 @@
 ---
-name: pages_migration_mark_as_not_deployed
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49473
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/295187
-milestone: '13.8'
+name: skip_pages_deploy_to_legacy_storage
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59298
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327725
+milestone: '13.11'
 type: development
 group: group::release
 default_enabled: false
diff --git a/config/feature_flags/development/ssh_key_expiration_email_notification.yml b/config/feature_flags/development/ssh_key_expiration_email_notification.yml
new file mode 100644
index 00000000000..ee051a4648b
--- /dev/null
+++ b/config/feature_flags/development/ssh_key_expiration_email_notification.yml
@@ -0,0 +1,8 @@
+---
+name: ssh_key_expiration_email_notification
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56888
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326386
+milestone: '13.11'
+type: development
+group: group::compliance
+default_enabled: false
diff --git a/config/feature_flags/development/swimlanes_buffered_rendering.yml b/config/feature_flags/development/swimlanes_buffered_rendering.yml
new file mode 100644
index 00000000000..30da5383406
--- /dev/null
+++ b/config/feature_flags/development/swimlanes_buffered_rendering.yml
@@ -0,0 +1,8 @@
+---
+name: swimlanes_buffered_rendering
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56614
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/324994
+milestone: '13.11'
+type: development
+group: group::product planning
+default_enabled: false
\ No newline at end of file
diff --git a/config/feature_flags/development/user_mode_in_session.yml b/config/feature_flags/development/sync_traversal_ids.yml
index 1b0a0053cf4..52777c502e6 100644
--- a/config/feature_flags/development/user_mode_in_session.yml
+++ b/config/feature_flags/development/sync_traversal_ids.yml
@@ -1,8 +1,7 @@
 ---
-name: user_mode_in_session
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16981
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321025
-milestone: 12.4
-type: development
+name: sync_traversal_ids
+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
diff --git a/config/feature_flags/development/customize_homepage.yml b/config/feature_flags/development/upgrade_link_in_user_menu_a.yml
index 2be1d5ff8e3..8ee4cf0ecbf 100644
--- a/config/feature_flags/development/customize_homepage.yml
+++ b/config/feature_flags/development/upgrade_link_in_user_menu_a.yml
@@ -1,8 +1,8 @@
 ---
-name: customize_homepage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54357
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/299895
-milestone: '13.10'
+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_code_review_aggregation.yml b/config/feature_flags/development/usage_data_code_review_aggregation.yml
index a41fd11dac3..23c8f86360a 100644
--- a/config/feature_flags/development/usage_data_code_review_aggregation.yml
+++ b/config/feature_flags/development/usage_data_code_review_aggregation.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/usage_data_g_compliance_dashboard.yml b/config/feature_flags/development/usage_data_g_compliance_dashboard.yml
deleted file mode 100644
index 2ca2893b1a9..00000000000
--- a/config/feature_flags/development/usage_data_g_compliance_dashboard.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_g_compliance_dashboard
-introduced_by_url:
-rollout_issue_url:
-milestone:
-type: development
-group: group::compliance
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_incident_management_oncall_notification_sent.yml b/config/feature_flags/development/usage_data_i_incident_management_oncall_notification_sent.yml
new file mode 100644
index 00000000000..3b8d02cc2d4
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_incident_management_oncall_notification_sent.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_incident_management_oncall_notification_sent
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58606
+rollout_issue_url:
+milestone: '13.11'
+type: development
+group: group::monitor
+default_enabled: true
diff --git a/config/feature_flags/development/codequality_backend_comparison.yml b/config/feature_flags/development/usage_data_i_testing_summary_widget_total.yml
index 9383ecb97d7..fb06ea9f58d 100644
--- a/config/feature_flags/development/codequality_backend_comparison.yml
+++ b/config/feature_flags/development/usage_data_i_testing_summary_widget_total.yml
@@ -1,8 +1,8 @@
 ---
-name: codequality_backend_comparison
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53068
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300796
-milestone: '13.9'
+name: usage_data_i_testing_summary_widget_total
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57543
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326058
+milestone: '13.11'
 type: development
 group: group::testing
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile.yml b/config/feature_flags/development/usage_data_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile.yml
index 64e46689775..36fe28236ec 100644
--- a/config/feature_flags/development/usage_data_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile.yml
+++ b/config/feature_flags/development/usage_data_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/322166
 milestone: '13.10'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_track_ci_templates_unique_projects.yml b/config/feature_flags/development/usage_data_track_ci_templates_unique_projects.yml
deleted file mode 100644
index 306e37ac308..00000000000
--- a/config/feature_flags/development/usage_data_track_ci_templates_unique_projects.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_track_ci_templates_unique_projects
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50481
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/296880
-milestone: '13.8'
-type: development
-group: group::configure
-default_enabled: true
diff --git a/config/feature_flags/development/use_distinct_for_all_object_hierarchy.yml b/config/feature_flags/development/use_distinct_for_all_object_hierarchy.yml
new file mode 100644
index 00000000000..9412e6af327
--- /dev/null
+++ b/config/feature_flags/development/use_distinct_for_all_object_hierarchy.yml
@@ -0,0 +1,8 @@
+---
+name: use_distinct_for_all_object_hierarchy
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57052
+rollout_issue_url: 
+milestone: '13.11'
+type: development
+group: group::database
+default_enabled: false
diff --git a/config/feature_flags/development/simplified_commit_status_group_name.yml b/config/feature_flags/development/use_distinct_in_register_job_object_hierarchy.yml
index 410d351de5f..8c57f197a87 100644
--- a/config/feature_flags/development/simplified_commit_status_group_name.yml
+++ b/config/feature_flags/development/use_distinct_in_register_job_object_hierarchy.yml
@@ -1,8 +1,8 @@
 ---
-name: simplified_commit_status_group_name
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52644
+name: use_distinct_in_register_job_object_hierarchy
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57045
 rollout_issue_url:
-milestone: '13.9'
+milestone: '13.11'
 type: development
-group: group::testing
+group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/dora_daily_metrics.yml b/config/feature_flags/development/use_marker_ranges.yml
index 7ca3cf66ea4..068e403e2cf 100644
--- a/config/feature_flags/development/dora_daily_metrics.yml
+++ b/config/feature_flags/development/use_marker_ranges.yml
@@ -1,8 +1,8 @@
 ---
-name: dora_daily_metrics
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55473
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/291746
+name: use_marker_ranges
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56361
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/324638
 milestone: '13.10'
 type: development
-group: group::release
+group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/use_traversal_ids.yml b/config/feature_flags/development/use_traversal_ids.yml
new file mode 100644
index 00000000000..e9fd2d03737
--- /dev/null
+++ b/config/feature_flags/development/use_traversal_ids.yml
@@ -0,0 +1,8 @@
+---
+name: use_traversal_ids
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56296
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321948
+milestone: '13.11'
+type: development
+group: group::access
+default_enabled: false
diff --git a/config/feature_flags/development/usage_data_i_analytics_cohorts.yml b/config/feature_flags/development/users_expanding_widgets_usage_data.yml
index b9c401b7e27..3b68aff5d71 100644
--- a/config/feature_flags/development/usage_data_i_analytics_cohorts.yml
+++ b/config/feature_flags/development/users_expanding_widgets_usage_data.yml
@@ -1,8 +1,8 @@
 ---
-name: usage_data_i_analytics_cohorts
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54329
+name: users_expanding_widgets_usage_data
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 rollout_issue_url:
-milestone: '13.9'
+milestone: '13.11'
 type: development
-group: group::optimize
+group: group::code review
 default_enabled: true
diff --git a/config/feature_flags/development/variable_inside_variable.yml b/config/feature_flags/development/variable_inside_variable.yml
index 1e75576a97a..2060958590f 100644
--- a/config/feature_flags/development/variable_inside_variable.yml
+++ b/config/feature_flags/development/variable_inside_variable.yml
@@ -1,8 +1,8 @@
 ---
 name: variable_inside_variable
-introduced_by_url:
-rollout_issue_url:
-milestone: '13.7'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50156
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/297382
+milestone: '13.11'
 type: development
 group: group::runner
 default_enabled: false
diff --git a/config/feature_flags/development/workhorse_extract_filename_base.yml b/config/feature_flags/development/workhorse_extract_filename_base.yml
new file mode 100644
index 00000000000..a80f6c45f28
--- /dev/null
+++ b/config/feature_flags/development/workhorse_extract_filename_base.yml
@@ -0,0 +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'
+type: development
+group: group::source code
+default_enabled: true
diff --git a/config/feature_flags/experiment/invite_members_in_comment.yml b/config/feature_flags/experiment/invite_members_in_comment.yml
new file mode 100644
index 00000000000..521574ad71b
--- /dev/null
+++ b/config/feature_flags/experiment/invite_members_in_comment.yml
@@ -0,0 +1,8 @@
+---
+name: invite_members_in_comment
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51400'
+rollout_issue_url: 'https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/300'
+milestone: '13.10'
+type: experiment
+group: group::expansion
+default_enabled: false
diff --git a/config/feature_flags/experiment/new_repo.yml b/config/feature_flags/experiment/new_repo.yml
new file mode 100644
index 00000000000..a39717538c1
--- /dev/null
+++ b/config/feature_flags/experiment/new_repo.yml
@@ -0,0 +1,8 @@
+---
+name: new_repo
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55818
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/285153
+milestone: '13.11'
+type: experiment
+group: group::adoption
+default_enabled: false
diff --git a/config/feature_flags/experiment/pipeline_empty_state_templates.yml b/config/feature_flags/experiment/pipeline_empty_state_templates.yml
new file mode 100644
index 00000000000..465034db65c
--- /dev/null
+++ b/config/feature_flags/experiment/pipeline_empty_state_templates.yml
@@ -0,0 +1,8 @@
+---
+name: pipeline_empty_state_templates
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57286
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326299
+milestone: '13.11'
+type: experiment
+group: group::activation
+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
new file mode 100644
index 00000000000..f518849b57f
--- /dev/null
+++ b/config/feature_flags/ops/execute_batched_migrations_on_schedule.yml
@@ -0,0 +1,8 @@
+---
+name: execute_batched_migrations_on_schedule
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51332
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326241
+milestone: '13.11'
+type: ops
+group: group::database
+default_enabled: false
diff --git a/config/feature_flags/ops/gitlab_service_measuring_projects_create_service.yml b/config/feature_flags/ops/gitlab_service_measuring_projects_create_service.yml
new file mode 100644
index 00000000000..78e60987a7f
--- /dev/null
+++ b/config/feature_flags/ops/gitlab_service_measuring_projects_create_service.yml
@@ -0,0 +1,8 @@
+---
+name: gitlab_service_measuring_projects_create_service
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30977
+rollout_issue_url: 
+milestone: '13.0'
+type: ops
+group: group::memory
+default_enabled: false
diff --git a/config/feature_flags/ops/gitlab_service_measuring_projects_import_export_export_service.yml b/config/feature_flags/ops/gitlab_service_measuring_projects_import_export_export_service.yml
new file mode 100644
index 00000000000..309492f8be9
--- /dev/null
+++ b/config/feature_flags/ops/gitlab_service_measuring_projects_import_export_export_service.yml
@@ -0,0 +1,8 @@
+---
+name: gitlab_service_measuring_projects_import_export_export_service
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30977
+rollout_issue_url: 
+milestone: '13.0'
+type: ops
+group: group::memory
+default_enabled: false
diff --git a/config/feature_flags/ops/gitlab_service_measuring_projects_import_service.yml b/config/feature_flags/ops/gitlab_service_measuring_projects_import_service.yml
new file mode 100644
index 00000000000..03a8eca99d9
--- /dev/null
+++ b/config/feature_flags/ops/gitlab_service_measuring_projects_import_service.yml
@@ -0,0 +1,8 @@
+---
+name: gitlab_service_measuring_projects_import_service
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30977
+rollout_issue_url: 
+milestone: '13.0'
+type: ops
+group: group::memory
+default_enabled: false
diff --git a/config/feature_flags/ops/recaptcha_on_top_level_group_creation.yml b/config/feature_flags/ops/recaptcha_on_top_level_group_creation.yml
new file mode 100644
index 00000000000..3ee8538b4fd
--- /dev/null
+++ b/config/feature_flags/ops/recaptcha_on_top_level_group_creation.yml
@@ -0,0 +1,8 @@
+---
+name: recaptcha_on_top_level_group_creation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56707
+rollout_issue_url:
+milestone: '13.11'
+type: ops
+group: group::access
+default_enabled: false
diff --git a/config/feature_flags/ops/redis_hll_tracking.yml b/config/feature_flags/ops/redis_hll_tracking.yml
new file mode 100644
index 00000000000..6570143d60d
--- /dev/null
+++ b/config/feature_flags/ops/redis_hll_tracking.yml
@@ -0,0 +1,8 @@
+---
+name: redis_hll_tracking
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56970
+rollout_issue_url:
+milestone: '13.11'
+type: ops
+group: group::product intelligence
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_api.yml b/config/feature_flags/ops/usage_data_api.yml
index 9ba8180eb5a..edb78c151d5 100644
--- a/config/feature_flags/development/usage_data_api.yml
+++ b/config/feature_flags/ops/usage_data_api.yml
@@ -3,6 +3,6 @@ name: usage_data_api
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41301
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267114
 milestone: '13.4'
-type: development
-group: group::product analytics
+type: ops
+group: group::product intelligence
 default_enabled: true
diff --git a/config/feature_flags/ops/usage_data_non_sql_metrics.yml b/config/feature_flags/ops/usage_data_non_sql_metrics.yml
new file mode 100644
index 00000000000..8347a20fe47
--- /dev/null
+++ b/config/feature_flags/ops/usage_data_non_sql_metrics.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_non_sql_metrics
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57050
+rollout_issue_url: 
+milestone: '13.11'
+type: ops
+group: group::product intelligence
+default_enabled: false
diff --git a/config/feature_flags/ops/usage_data_queries_api.yml b/config/feature_flags/ops/usage_data_queries_api.yml
new file mode 100644
index 00000000000..4b6cdad2521
--- /dev/null
+++ b/config/feature_flags/ops/usage_data_queries_api.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_queries_api
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57016
+rollout_issue_url: 
+milestone: '13.11'
+type: ops
+group: group::product intelligence
+default_enabled: false
diff --git a/config/feature_flags/ops/x509_forced_cert_loading.yml b/config/feature_flags/ops/x509_forced_cert_loading.yml
new file mode 100644
index 00000000000..b884a5b47bc
--- /dev/null
+++ b/config/feature_flags/ops/x509_forced_cert_loading.yml
@@ -0,0 +1,8 @@
+---
+name: x509_forced_cert_loading
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54569
+rollout_issue_url:
+milestone: '13.10'
+type: ops
+group: group::source code
+default_enabled: false
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 57ece521301..da1a15302da 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -6,7 +6,7 @@
 # This file should not receive new settings. All configuration options #
 # * are being moved to ApplicationSetting model!                       #
 # If a setting requires an application restart say so in that screen.  #
-# If you change this file in a Merge Request, please also create       #
+# If you change this file in a merge request, please also create       #
 # a MR on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests. #
 # For more details see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/gitlab.yml.md #
 ########################################################################
@@ -210,6 +210,13 @@ production: &base
     # Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery
     expunge_deleted: false
 
+    # For Microsoft Graph support
+    # inbox_method: microsoft_graph
+    # inbox_options:
+    #   tenant_id: "YOUR-TENANT-ID"
+    #   client_id: "YOUR-CLIENT-ID"
+    #   client_secret: "YOUR-CLIENT-SECRET"
+
   ## Consolidated object store config
   ## This will only take effect if the object_store sections are not defined
   ## within the types (e.g. artifacts, lfs, etc.).
@@ -408,6 +415,10 @@ production: &base
         aws_access_key_id: AWS_ACCESS_KEY_ID
         aws_secret_access_key: AWS_SECRET_ACCESS_KEY
         region: us-east-1
+    local_store:
+      enabled: true
+      # The location where pages are stored (default: shared/pages).
+      # path: shared/pages
 
   ## Mattermost
   ## For enabling Add to Mattermost button
@@ -485,7 +496,7 @@ production: &base
   ee_cron_jobs:
     # Schedule snapshots for all devops adoption segments
     analytics_devops_adoption_create_all_snapshots_worker:
-      cron: 0 4 * * *
+      cron: 0 4 * * 0
 
     # Snapshot active users statistics
     historical_data_worker:
@@ -1395,6 +1406,9 @@ test:
         aws_access_key_id: AWS_ACCESS_KEY_ID
         aws_secret_access_key: AWS_SECRET_ACCESS_KEY
         region: us-east-1
+    local_store:
+      enabled: true
+      path: tmp/tests/pages
   repositories:
     storages:
       default:
diff --git a/config/helpers/check_frontend_integration_env.js b/config/helpers/check_frontend_integration_env.js
new file mode 100644
index 00000000000..38393c89445
--- /dev/null
+++ b/config/helpers/check_frontend_integration_env.js
@@ -0,0 +1,37 @@
+const fs = require('fs');
+const isESLint = require('./is_eslint');
+
+const GRAPHQL_SCHEMA_PATH = 'tmp/tests/graphql/gitlab_schema.graphql';
+const GRAPHQL_SCHEMA_JOB = 'bundle exec rake gitlab:graphql:schema:dump';
+
+const shouldIgnoreWarnings = JSON.parse(process.env.GL_IGNORE_WARNINGS || '0');
+
+const failCheck = (message) => {
+  console.error(message);
+
+  if (!shouldIgnoreWarnings) {
+    process.exit(1);
+  }
+};
+
+const checkGraphqlSchema = () => {
+  if (!fs.existsSync(GRAPHQL_SCHEMA_PATH)) {
+    const message = `
+ERROR: Expected to find "${GRAPHQL_SCHEMA_PATH}" but file does not exist. Try running:
+
+    ${GRAPHQL_SCHEMA_JOB}
+`;
+
+    failCheck(message);
+  }
+};
+
+const check = () => {
+  if (isESLint(module)) {
+    return;
+  }
+
+  checkGraphqlSchema();
+};
+
+module.exports = check;
diff --git a/config/initializers/0_inject_enterprise_edition_module.rb b/config/initializers/0_inject_enterprise_edition_module.rb
index 7478727f869..f9c82f45040 100644
--- a/config/initializers/0_inject_enterprise_edition_module.rb
+++ b/config/initializers/0_inject_enterprise_edition_module.rb
@@ -31,6 +31,12 @@ module InjectEnterpriseEditionModule
     include(ee_module) if Gitlab.ee?
   end
 
+  def prepend_if_jh(constant, with_descendants: false)
+    return unless Gitlab.jh?
+
+    prepend_module(constant.constantize, with_descendants)
+  end
+
   private
 
   def prepend_module(mod, with_descendants)
diff --git a/config/initializers/0_license.rb b/config/initializers/0_license.rb
index ce3103be2e4..3db5ec0a91a 100644
--- a/config/initializers/0_license.rb
+++ b/config/initializers/0_license.rb
@@ -1,10 +1,18 @@
 # frozen_string_literal: true
 
-Gitlab.ee do
+load_license = lambda do |dir:, license_name:|
   prefix = ENV['GITLAB_LICENSE_MODE'] == 'test' ? 'test_' : ''
-  public_key_file = File.read(Rails.root.join(".#{prefix}license_encryption_key.pub"))
+  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
-  warn "WARNING: No valid license encryption key provided."
+  warn "WARNING: No valid #{license_name} encryption key provided."
+end
+
+Gitlab.ee do
+  load_license.call(dir: '.', license_name: 'license')
+end
+
+Gitlab.jh do
+  load_license.call(dir: 'jh', license_name: 'JH license')
 end
diff --git a/config/initializers/0_marginalia.rb b/config/initializers/0_marginalia.rb
index ab21f936cd8..7e48c9d4fcd 100644
--- a/config/initializers/0_marginalia.rb
+++ b/config/initializers/0_marginalia.rb
@@ -13,7 +13,7 @@ require 'marginalia'
 # matching against the raw SQL, and prepending the comment prevents color
 # coding from working in the development log.
 Marginalia::Comment.prepend_comment = true if Rails.env.production?
-Marginalia::Comment.components = [:application, :controller, :action, :correlation_id, :jid, :job_class, :endpoint_id]
+Marginalia::Comment.components = [:application, :correlation_id, :jid, :endpoint_id]
 
 # As mentioned in https://github.com/basecamp/marginalia/pull/93/files,
 # adding :line has some overhead because a regexp on the backtrace has
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index b8dc464deed..99335321f28 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -68,7 +68,7 @@ if Settings.ldap['enabled'] || Rails.env.test?
     server['tls_options'] ||= {}
 
     if server['ssl_version'] || server['ca_file']
-      Rails.logger.warn 'DEPRECATED: LDAP options `ssl_version` and `ca_file` should be nested within `tls_options`' # rubocop:disable Gitlab/RailsLogger
+      Gitlab::AppLogger.warn 'DEPRECATED: LDAP options `ssl_version` and `ca_file` should be nested within `tls_options`'
     end
 
     if server['ssl_version']
@@ -184,8 +184,8 @@ Settings.gitlab['user'] ||= 'git'
 Settings.gitlab['ssh_user'] ||= Settings.gitlab.user
 Settings.gitlab['user_home'] ||= begin
   Etc.getpwnam(Settings.gitlab['user']).dir
-                                 rescue ArgumentError # no user configured
-                                   '/home/' + Settings.gitlab['user']
+rescue ArgumentError # no user configured
+  '/home/' + Settings.gitlab['user']
 end
 Settings.gitlab['time_zone'] ||= nil
 Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
@@ -310,6 +310,9 @@ Settings.pages['secret_file'] ||= Rails.root.join('.gitlab_pages_secret')
 # this will allow us to easier migrate existing instances with NFS
 Settings.pages['storage_path']      = Settings.pages['path']
 Settings.pages['object_store']      = ObjectStoreSettings.legacy_parse(Settings.pages['object_store'])
+Settings.pages['local_store'] ||= Settingslogic.new({})
+Settings.pages['local_store']['path'] = Settings.absolute(Settings.pages['local_store']['path'] || File.join(Settings.shared['path'], "pages"))
+Settings.pages['local_store']['enabled'] = true if Settings.pages['local_store']['enabled'].nil?
 
 #
 # GitLab documentation
@@ -512,9 +515,6 @@ Settings.cron_jobs['pages_domain_ssl_renewal_cron_worker']['job_class'] = 'Pages
 Settings.cron_jobs['issue_due_scheduler_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['issue_due_scheduler_worker']['cron'] ||= '50 00 * * *'
 Settings.cron_jobs['issue_due_scheduler_worker']['job_class'] = 'IssueDueSchedulerWorker'
-Settings.cron_jobs['prune_web_hook_logs_worker'] ||= Settingslogic.new({})
-Settings.cron_jobs['prune_web_hook_logs_worker']['cron'] ||= '0 */1 * * *'
-Settings.cron_jobs['prune_web_hook_logs_worker']['job_class'] = 'PruneWebHookLogsWorker'
 Settings.cron_jobs['metrics_dashboard_schedule_annotations_prune_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['metrics_dashboard_schedule_annotations_prune_worker']['cron'] ||= '0 1 * * *'
 Settings.cron_jobs['metrics_dashboard_schedule_annotations_prune_worker']['job_class'] = 'Metrics::Dashboard::ScheduleAnnotationsPruneWorker'
@@ -560,16 +560,25 @@ Settings.cron_jobs['manage_evidence_worker']['job_class'] = 'Releases::ManageEvi
 Settings.cron_jobs['user_status_cleanup_batch_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['user_status_cleanup_batch_worker']['cron'] ||= '* * * * *'
 Settings.cron_jobs['user_status_cleanup_batch_worker']['job_class'] = 'UserStatusCleanup::BatchWorker'
+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']['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'
 
 Gitlab.com do
-  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']['job_class'] = 'Namespaces::InProductMarketingEmailsWorker'
+  Settings.cron_jobs['batched_background_migrations_worker'] ||= Settingslogic.new({})
+  Settings.cron_jobs['batched_background_migrations_worker']['cron'] ||= '* * * * *'
+  Settings.cron_jobs['batched_background_migrations_worker']['job_class'] = 'Database::BatchedBackgroundMigrationWorker'
 end
 
 Gitlab.ee do
   Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker'] ||= Settingslogic.new({})
-  Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker']['cron'] ||= '0 4 * * *'
+  Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker']['cron'] ||= '0 4 * * 0'
   Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker']['job_class'] = 'Analytics::DevopsAdoption::CreateAllSnapshotsWorker'
   Settings.cron_jobs['active_user_count_threshold_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['active_user_count_threshold_worker']['cron'] ||= '0 12 * * *'
@@ -586,6 +595,9 @@ Gitlab.ee do
   Settings.cron_jobs['geo_verification_cron_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['geo_verification_cron_worker']['cron'] ||= '* * * * *'
   Settings.cron_jobs['geo_verification_cron_worker']['job_class'] ||= 'Geo::VerificationCronWorker'
+  Settings.cron_jobs['geo_sync_timeout_cron_worker'] ||= Settingslogic.new({})
+  Settings.cron_jobs['geo_sync_timeout_cron_worker']['cron'] ||= '*/10 * * * *'
+  Settings.cron_jobs['geo_sync_timeout_cron_worker']['job_class'] ||= 'Geo::SyncTimeoutCronWorker'
   Settings.cron_jobs['geo_secondary_usage_data_cron_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['geo_secondary_usage_data_cron_worker']['cron'] ||= '0 0 * * 0'
   Settings.cron_jobs['geo_secondary_usage_data_cron_worker']['job_class'] ||= 'Geo::SecondaryUsageDataCronWorker'
diff --git a/config/initializers/active_record_ping.rb b/config/initializers/active_record_ping.rb
index 196f587f565..7088c690a51 100644
--- a/config/initializers/active_record_ping.rb
+++ b/config/initializers/active_record_ping.rb
@@ -2,6 +2,6 @@
 
 # # frozen_string_literal: true
 
-if Gitlab::Utils.to_boolean(ENV['ENABLE_ACTIVERECORD_EMPTY_PING'], default: false)
+if Gitlab::Utils.to_boolean(ENV['ENABLE_ACTIVERECORD_EMPTY_PING'], default: true)
   ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(Gitlab::Database::PostgresqlAdapter::EmptyQueryPing)
 end
diff --git a/config/initializers/active_record_preloader.rb b/config/initializers/active_record_preloader.rb
index 349ca6c4831..257a8a9e955 100644
--- a/config/initializers/active_record_preloader.rb
+++ b/config/initializers/active_record_preloader.rb
@@ -9,6 +9,7 @@ module ActiveRecord
         end
 
         def self.run
+          self
         end
 
         def self.preloaded_records
diff --git a/config/initializers/bullet.rb b/config/initializers/bullet.rb
index 2d21514b121..3ef426aaadc 100644
--- a/config/initializers/bullet.rb
+++ b/config/initializers/bullet.rb
@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-def bullet_enabled?
-  Gitlab::Utils.to_boolean(ENV['ENABLE_BULLET'].to_s)
-end
-
-if defined?(Bullet) && (bullet_enabled? || Rails.env.development?)
+if Gitlab::Bullet.configure_bullet?
   Rails.application.configure do
     config.after_initialize do
       Bullet.enable = true
 
-      Bullet.bullet_logger = bullet_enabled?
-      Bullet.console = bullet_enabled?
+      if Gitlab::Bullet.extra_logging_enabled?
+        Bullet.bullet_logger = true
+        Bullet.console = true
+      end
 
       Bullet.raise = Rails.env.test?
+
+      Bullet.stacktrace_excludes = Gitlab::Bullet::Exclusions.new.execute
     end
   end
 end
diff --git a/config/initializers/graphql.rb b/config/initializers/graphql.rb
index f1bc289f1f0..52c26e756a5 100644
--- a/config/initializers/graphql.rb
+++ b/config/initializers/graphql.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
 GraphQL::ObjectType.accepts_definitions(authorize: GraphQL::Define.assign_metadata_key(:authorize))
-GraphQL::Field.accepts_definitions(authorize: GraphQL::Define.assign_metadata_key(:authorize))
 
 GraphQL::Schema::Object.accepts_definition(:authorize)
-GraphQL::Schema::Field.accepts_definition(:authorize)
diff --git a/config/initializers/hangouts_chat_http_override.rb b/config/initializers/hangouts_chat_http_override.rb
index 4fd886697e4..edb31ed53f1 100644
--- a/config/initializers/hangouts_chat_http_override.rb
+++ b/config/initializers/hangouts_chat_http_override.rb
@@ -17,9 +17,8 @@ module HangoutsChat
             headers: { 'Content-Type' => 'application/json' },
             parse: nil # disables automatic response parsing
           )
-          net_http_response = httparty_response.response
+          httparty_response.response
           # The rest of the integration expects a Net::HTTP response
-          net_http_response
         end
       end
 
diff --git a/config/initializers/json_validator_patch.rb b/config/initializers/json_validator_patch.rb
deleted file mode 100644
index cb4158045ee..00000000000
--- a/config/initializers/json_validator_patch.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-# This patches https://github.com/ruby-json-schema/json-schema/blob/765e6d8fdbfdaca1a42fa743f4621e757f9f6a03/lib/json-schema/validator.rb
-# to address https://github.com/ruby-json-schema/json-schema/issues/148.
-require 'json-schema'
-
-module JSON
-  class Validator
-    def initialize_data(data)
-      if @options[:parse_data]
-        if @options[:json]
-          data = self.class.parse(data)
-        elsif @options[:uri]
-          json_uri = Util::URI.normalized_uri(data)
-          data = self.class.parse(custom_open(json_uri))
-        elsif data.is_a?(String)
-          begin
-            data = self.class.parse(data)
-          rescue JSON::Schema::JsonParseError
-            # Silently discard the error - use the data as-is
-          end
-        end
-      end
-
-      JSON::Schema.stringify(data)
-    end
-  end
-end
diff --git a/config/initializers/kramdown_patch.rb b/config/initializers/kramdown_patch.rb
deleted file mode 100644
index 5cb769cec24..00000000000
--- a/config/initializers/kramdown_patch.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-#
-# This pulls in https://github.com/gettalong/kramdown/pull/708 for kramdown v2.3.0.
-# Remove this file when that pull request is merged and released.
-require 'kramdown/converter'
-require 'kramdown/converter/syntax_highlighter/rouge'
-
-module Kramdown::Converter::SyntaxHighlighter
-  module Rouge
-    def self.formatter_class(opts = {})
-      case formatter = opts[:formatter]
-      when Class
-        formatter
-      when /\A[[:upper:]][[:alnum:]_]*\z/
-        ::Rouge::Formatters.const_get(formatter, false)
-      else
-        # Available in Rouge 2.0 or later
-        ::Rouge::Formatters::HTMLLegacy
-      end
-    rescue NameError
-      # Fallback to Rouge 1.x
-      ::Rouge::Formatters::HTML
-    end
-  end
-end
diff --git a/config/initializers/pages_storage_check.rb b/config/initializers/pages_storage_check.rb
new file mode 100644
index 00000000000..8e0e0464ed6
--- /dev/null
+++ b/config/initializers/pages_storage_check.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# This is to make sure at least one storage strategy for Pages is enabled.
+
+pages = Settings.pages
+
+return unless pages['enabled'] && pages['local_store']
+
+local_store_enabled = Gitlab::Utils.to_boolean(pages['local_store']['enabled'])
+object_store_enabled = Gitlab::Utils.to_boolean(pages['object_store']['enabled'])
+
+if !local_store_enabled && !object_store_enabled
+  raise "Please enable at least one of the two Pages storage strategy (local_store or object_store) in your config/gitlab.yml."
+end
diff --git a/config/initializers/postgres_cte_as_materialized.rb b/config/initializers/postgres_cte_as_materialized.rb
new file mode 100644
index 00000000000..85b3361e25e
--- /dev/null
+++ b/config/initializers/postgres_cte_as_materialized.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# This patch adds support for AS MATERIALIZED in Arel, see Gitlab::Database::AsWithMaterialized for more info
+module Arel
+  module Visitors
+    class Arel::Visitors::PostgreSQL
+      def visit_Gitlab_Database_AsWithMaterialized(obj, collector) # rubocop:disable Naming/MethodName
+        collector = visit obj.left, collector
+        collector << " AS#{obj.expr} "
+        visit obj.right, collector
+      end
+    end
+  end
+end
diff --git a/config/initializers/postgresql_cte.rb b/config/initializers/postgresql_cte.rb
index 1ea0b4cfb58..6a9af7b4868 100644
--- a/config/initializers/postgresql_cte.rb
+++ b/config/initializers/postgresql_cte.rb
@@ -121,6 +121,8 @@ module ActiveRecord
           end
         when Arel::Nodes::As
           with_value
+        when Gitlab::Database::AsWithMaterialized
+          with_value
         end
       end
 
diff --git a/config/initializers/puma_client_tempfile_patch.rb b/config/initializers/puma_client_tempfile_patch.rb
new file mode 100644
index 00000000000..e1faa21804f
--- /dev/null
+++ b/config/initializers/puma_client_tempfile_patch.rb
@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+if Gitlab::Runtime.puma?
+  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
+
+          @read_header = false
+
+          body = @parser.body
+
+          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
+              end
+            elsif CHUNKED.casecmp(te) == 0
+              return setup_chunked_body(body)
+            end
+          end
+
+          @chunked_body = false
+
+          cl = @env[CONTENT_LENGTH]
+
+          unless cl
+            @buffer = body.empty? ? nil : body
+            @body = EmptyBody
+            set_ready
+            return true
+          end
+
+          remain = cl.to_i - body.bytesize
+
+          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
+
+          @body.write body
+
+          @body_remain = remain
+
+          return false # rubocop:disable Style/RedundantReturn
+        end
+
+        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
+
+          if decode_chunk(body)
+            @env[CONTENT_LENGTH] = @chunked_content_length
+            return true # rubocop:disable Style/RedundantReturn
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/config/initializers/query_limiting.rb b/config/initializers/query_limiting.rb
index 66aefc97c6a..7dfa27c395a 100644
--- a/config/initializers/query_limiting.rb
+++ b/config/initializers/query_limiting.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if Gitlab::QueryLimiting.enable?
+if Gitlab::QueryLimiting.enabled_for_env?
   require_dependency 'gitlab/query_limiting/active_support_subscriber'
   require_dependency 'gitlab/query_limiting/transaction'
   require_dependency 'gitlab/query_limiting/middleware'
diff --git a/config/initializers/smtp_settings.rb.sample b/config/initializers/smtp_settings.rb.sample
index bd37080b1c8..4a50c29143d 100644
--- a/config/initializers/smtp_settings.rb.sample
+++ b/config/initializers/smtp_settings.rb.sample
@@ -5,7 +5,7 @@
 #
 # For full list of options and their values see http://api.rubyonrails.org/classes/ActionMailer/Base.html
 #
-# If you change this file in a Merge Request, please also create a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+# If you change this file in a merge request, please also create a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
 
 if Rails.env.production?
   Rails.application.config.action_mailer.delivery_method = :smtp
@@ -22,3 +22,28 @@ if Rails.env.production?
     openssl_verify_mode: 'peer' # See ActionMailer documentation for other possible options
   }
 end
+
+# To use an SMTP connection pool, uncomment the following section:
+#
+# require 'mail/smtp_pool'
+#
+# ActionMailer::Base.add_delivery_method :smtp_pool, Mail::SMTPPool
+#
+# if Rails.env.production?
+#   Rails.application.config.action_mailer.delivery_method = :smtp_pool
+#
+#   ActionMailer::Base.delivery_method = :smtp_pool
+#   ActionMailer::Base.smtp_pool_settings = {
+#     pool: Mail::SMTPPool.create_pool(
+#       pool_size: Gitlab::Runtime.max_threads,
+#       address: "email.server.com",
+#       port: 465,
+#       user_name: "smtp",
+#       password: "123456",
+#       domain: "gitlab.company.com",
+#       authentication: :login,
+#       enable_starttls_auto: true,
+#       openssl_verify_mode: 'peer' # See ActionMailer documentation for other possible options
+#     )
+#   }
+# end
diff --git a/config/initializers/trusted_proxies.rb b/config/initializers/trusted_proxies.rb
index 79e4b831c5e..f03561b5617 100644
--- a/config/initializers/trusted_proxies.rb
+++ b/config/initializers/trusted_proxies.rb
@@ -17,7 +17,7 @@ end
 
 gitlab_trusted_proxies = Array(Gitlab.config.gitlab.trusted_proxies).map do |proxy|
   IPAddr.new(proxy)
-                         rescue IPAddr::InvalidAddressError
+rescue IPAddr::InvalidAddressError
 end.compact
 
 Rails.application.config.action_dispatch.trusted_proxies = (
diff --git a/config/initializers_before_autoloader/000_inflections.rb b/config/initializers_before_autoloader/000_inflections.rb
index 308b38c1ba2..de8f79b9a29 100644
--- a/config/initializers_before_autoloader/000_inflections.rb
+++ b/config/initializers_before_autoloader/000_inflections.rb
@@ -24,6 +24,7 @@ ActiveSupport::Inflector.inflections do |inflect|
     job_artifact_registry
     lfs_object_registry
     package_file_registry
+    pipeline_artifact_registry
     project_auto_devops
     project_registry
     project_statistics
@@ -34,5 +35,6 @@ ActiveSupport::Inflector.inflections do |inflect|
     vulnerability_feedback
   )
   inflect.acronym 'EE'
+  inflect.acronym 'JH'
   inflect.acronym 'CSP'
 end
diff --git a/config/known_invalid_graphql_queries.yml b/config/known_invalid_graphql_queries.yml
index 2989b3a4262..3c6ef13dd1c 100644
--- a/config/known_invalid_graphql_queries.yml
+++ b/config/known_invalid_graphql_queries.yml
@@ -4,3 +4,6 @@ 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/locales/devise.en.yml b/config/locales/devise.en.yml
index 06dece58173..036bafef134 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -9,10 +9,10 @@ en:
     failure:
       already_authenticated: "You are already signed in."
       inactive: "Your account is not activated yet."
-      invalid: "Invalid %{authentication_keys} or password."
+      invalid: "Invalid login or password."
       locked: "Your account is locked."
       last_attempt: "You have one more attempt before your account is locked."
-      not_found_in_database: "Invalid %{authentication_keys} or password."
+      not_found_in_database: "Invalid login or password."
       timeout: "Your session expired. Please sign in again to continue."
       unauthenticated: "You need to sign in or sign up before continuing."
       unconfirmed: "You have to confirm your email address before continuing. Please check your email for the link we sent you, or click 'Resend confirmation email'."
diff --git a/config/mail_room.yml b/config/mail_room.yml
index 23170acbf65..25bda294a13 100644
--- a/config/mail_room.yml
+++ b/config/mail_room.yml
@@ -19,6 +19,13 @@
       :delete_after_delivery: true
       :expunge_deleted: <%= config[:expunge_deleted].to_json %>
 
+      <% if config[:inbox_method] %>
+      :inbox_method: <%= config[:inbox_method] %>
+      <% end %>
+      <% if config[:inbox_options].is_a?(Hash) %>
+      <%= config.slice(:inbox_options).to_yaml(indentation: 8).gsub(/^---\n/, '') %>
+      <% end %>
+
       :delivery_method: sidekiq
       :delivery_options:
         :redis_url: <%= config[:redis_url].to_json %>
diff --git a/config/metrics/aggregates/code_review.yml b/config/metrics/aggregates/code_review.yml
new file mode 100644
index 00000000000..a2e931bd217
--- /dev/null
+++ b/config/metrics/aggregates/code_review.yml
@@ -0,0 +1,105 @@
+# code_review_extension_category_monthly_active_users
+# This is only metrics related to the VS Code Extension for now.
+#
+# code_review_category_monthly_active_users
+# This is the user based metrics. These should only be user based metrics and only be related to the Code Review things inside of GitLab.
+#
+# code_review_group_monthly_active_users
+# This is an aggregation of both of the above aggregations. It's intended to represent all users who interact with our group across all of our categories.
+---
+- name: code_review_group_monthly_active_users
+  operator: OR
+  feature_flag: usage_data_code_review_aggregation
+  source: redis
+  time_frame: [7d, 28d]
+  events:
+    - 'i_code_review_user_single_file_diffs'
+    - 'i_code_review_user_create_mr'
+    - 'i_code_review_user_close_mr'
+    - 'i_code_review_user_reopen_mr'
+    - 'i_code_review_user_resolve_thread'
+    - 'i_code_review_user_unresolve_thread'
+    - 'i_code_review_edit_mr_title'
+    - 'i_code_review_edit_mr_desc'
+    - 'i_code_review_user_merge_mr'
+    - 'i_code_review_user_create_mr_comment'
+    - 'i_code_review_user_edit_mr_comment'
+    - 'i_code_review_user_remove_mr_comment'
+    - 'i_code_review_user_create_review_note'
+    - 'i_code_review_user_publish_review'
+    - 'i_code_review_user_create_multiline_mr_comment'
+    - 'i_code_review_user_edit_multiline_mr_comment'
+    - 'i_code_review_user_remove_multiline_mr_comment'
+    - 'i_code_review_user_add_suggestion'
+    - 'i_code_review_user_apply_suggestion'
+    - 'i_code_review_user_assigned'
+    - 'i_code_review_user_review_requested'
+    - 'i_code_review_user_approve_mr'
+    - 'i_code_review_user_unapprove_mr'
+    - 'i_code_review_user_marked_as_draft'
+    - 'i_code_review_user_unmarked_as_draft'
+    - 'i_code_review_user_approval_rule_added'
+    - 'i_code_review_user_approval_rule_deleted'
+    - 'i_code_review_user_approval_rule_edited'
+    - 'i_code_review_user_vs_code_api_request'
+    - 'i_code_review_user_toggled_task_item_status'
+    - 'i_code_review_user_create_mr_from_issue'
+    - 'i_code_review_user_mr_discussion_locked'
+    - 'i_code_review_user_mr_discussion_unlocked'
+    - 'i_code_review_user_time_estimate_changed'
+    - 'i_code_review_user_time_spent_changed'
+    - 'i_code_review_user_assignees_changed'
+    - 'i_code_review_user_reviewers_changed'
+    - 'i_code_review_user_milestone_changed'
+    - 'i_code_review_user_labels_changed'
+- name: code_review_category_monthly_active_users
+  operator: OR
+  feature_flag: usage_data_code_review_aggregation
+  source: redis
+  time_frame: [7d, 28d]
+  events:
+    - 'i_code_review_user_single_file_diffs'
+    - 'i_code_review_user_create_mr'
+    - 'i_code_review_user_close_mr'
+    - 'i_code_review_user_reopen_mr'
+    - 'i_code_review_user_resolve_thread'
+    - 'i_code_review_user_unresolve_thread'
+    - 'i_code_review_edit_mr_title'
+    - 'i_code_review_edit_mr_desc'
+    - 'i_code_review_user_merge_mr'
+    - 'i_code_review_user_create_mr_comment'
+    - 'i_code_review_user_edit_mr_comment'
+    - 'i_code_review_user_remove_mr_comment'
+    - 'i_code_review_user_create_review_note'
+    - 'i_code_review_user_publish_review'
+    - 'i_code_review_user_create_multiline_mr_comment'
+    - 'i_code_review_user_edit_multiline_mr_comment'
+    - 'i_code_review_user_remove_multiline_mr_comment'
+    - 'i_code_review_user_add_suggestion'
+    - 'i_code_review_user_apply_suggestion'
+    - 'i_code_review_user_assigned'
+    - 'i_code_review_user_review_requested'
+    - 'i_code_review_user_approve_mr'
+    - 'i_code_review_user_unapprove_mr'
+    - 'i_code_review_user_marked_as_draft'
+    - 'i_code_review_user_unmarked_as_draft'
+    - 'i_code_review_user_approval_rule_added'
+    - 'i_code_review_user_approval_rule_deleted'
+    - 'i_code_review_user_approval_rule_edited'
+    - 'i_code_review_user_toggled_task_item_status'
+    - 'i_code_review_user_create_mr_from_issue'
+    - 'i_code_review_user_mr_discussion_locked'
+    - 'i_code_review_user_mr_discussion_unlocked'
+    - 'i_code_review_user_time_estimate_changed'
+    - 'i_code_review_user_time_spent_changed'
+    - 'i_code_review_user_assignees_changed'
+    - 'i_code_review_user_reviewers_changed'
+    - 'i_code_review_user_milestone_changed'
+    - 'i_code_review_user_labels_changed'
+- name: code_review_extension_category_monthly_active_users
+  operator: OR
+  feature_flag: usage_data_code_review_aggregation
+  source: redis
+  time_frame: [7d, 28d]
+  events:
+    - 'i_code_review_user_vs_code_api_request'
diff --git a/config/metrics/aggregates/common.yml b/config/metrics/aggregates/common.yml
new file mode 100644
index 00000000000..beabb72dd72
--- /dev/null
+++ b/config/metrics/aggregates/common.yml
@@ -0,0 +1,64 @@
+# Aggregated metrics that include EE only event names within `events:` attribute have to be defined at ee/config/metrics/aggregates/common.yml
+# instead of this file.
+#- name: unique name of aggregated metric
+#  operator: aggregation operator. Valid values are:
+#             - "OR": counts unique elements that were observed triggering any of following events
+#             - "AND": counts unique elements that were observed triggering all of following events
+#  events: list of events names to aggregate into metric. All events in this list must have the same 'redis_slot' and 'aggregation' attributes
+#           see from lib/gitlab/usage_data_counters/known_events/ for the list of valid events.
+#  source: defines which datasource will be used to locate events that should be included in aggregated metric. Valid values are:
+#          - database
+#          - redis
+#  time_frame: defines time frames for aggregated metrics:
+#          - 7d - last 7 days
+#          - 28d - last 28 days
+#          - all - all historical available data, this time frame is not available for redis source
+#  feature_flag: name of development feature flag that will be checked before metrics aggregation is performed.
+#                Corresponding feature flag should have `default_enabled` attribute set to `false`.
+#                This attribute is OPTIONAL and can be omitted, when `feature_flag` is missing no feature flag will be checked.
+---
+- name: compliance_features_track_unique_visits_union
+  operator: OR
+  source: redis
+  time_frame: [7d, 28d]
+  events:
+    - 'g_compliance_audit_events'
+    - 'g_compliance_dashboard'
+    - 'i_compliance_audit_events'
+    - 'a_compliance_audit_events_api'
+    - 'i_compliance_credential_inventory'
+- name: incident_management_alerts_total_unique_counts
+  operator: OR
+  source: redis
+  time_frame: [7d, 28d]
+  events:
+    - 'incident_management_alert_status_changed'
+    - 'incident_management_alert_assigned'
+    - 'incident_management_alert_todo'
+    - 'incident_management_alert_create_incident'
+- name: incident_management_incidents_total_unique_counts
+  operator: OR
+  source: redis
+  time_frame: [7d, 28d]
+  events:
+    - 'incident_management_incident_created'
+    - 'incident_management_incident_reopened'
+    - 'incident_management_incident_closed'
+    - 'incident_management_incident_assigned'
+    - 'incident_management_incident_todo'
+    - 'incident_management_incident_comment'
+    - 'incident_management_incident_zoom_meeting'
+    - 'incident_management_incident_published'
+    - 'incident_management_incident_relate'
+    - 'incident_management_incident_unrelate'
+    - 'incident_management_incident_change_confidential'
+- name: i_testing_paid_monthly_active_user_total
+  operator: OR
+  source: redis
+  time_frame: [7d, 28d]
+  events:
+    - 'i_testing_web_performance_widget_total'
+    - 'i_testing_full_code_quality_report_total'
+    - 'i_testing_group_code_coverage_visit_total'
+    - 'i_testing_load_performance_widget_total'
+    - 'i_testing_metrics_report_widget_total'
diff --git a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
index 43f967d5e92..1561e0e9c3b 100644
--- a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+name: "count_distinct_user_id_from_<adjective describing: '(clusters_applications_cert_managers.status IN (3, 5))'>_clusters_<with>_<adjective describing: '(clusters_applications_cert_managers.status IN (3, 5))'>_clusters_applications_cert_managers"
diff --git a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
index 5aeea54a4a8..8882af8aa13 100644
--- a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
+++ b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+name: "count_distinct_user_id_from_<adjective describing: '(clusters_applications_helm.status IN (3, 5))'>_clusters_<with>_<adjective describing: '(clusters_applications_helm.status IN (3, 5))'>_clusters_applications_helm"
diff --git a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
index 9d2da437f7a..189623b8644 100644
--- a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
+++ b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+name: "count_distinct_user_id_from_<adjective describing: '(clusters_applications_ingress.status IN (3, 5))'>_clusters_<with>_<adjective describing: '(clusters_applications_ingress.status IN (3, 5))'>_clusters_applications_ingress"
diff --git a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
index 6a1bfaf23d9..5a67a5b39d5 100644
--- a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
+++ b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+name: "count_distinct_user_id_from_<adjective describing: '(clusters_applications_knative.status IN (3, 5))'>_clusters_<with>_<adjective describing: '(clusters_applications_knative.status IN (3, 5))'>_clusters_applications_knative"
diff --git a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
index 6763750f777..5310c4db557 100644
--- a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
+++ b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
@@ -17,3 +17,4 @@ tier:
 - 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/20210216175415_clusters_disabled.yml b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
index cd23c062279..8d1b8dfabd6 100644
--- a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = FALSE)'>_clusters"
diff --git a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
index 559067cb044..2d2d438022a 100644
--- a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = TRUE)'>_clusters"
diff --git a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
index a4b3eafb813..0c3e410d1c4 100644
--- a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
+++ b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+name: "count_distinct_user_id_from_<adjective describing: '(clusters.provider_type = 1 AND (cluster_providers_gcp.status IN (3)) AND clusters.enabled = TRUE)'>_clusters_<with>_<adjective describing: '(clusters.provider_type = 1 AND (cluster_providers_gcp.status IN (3)) AND clusters.enabled = TRUE)'>_cluster_providers_gcp"
diff --git a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
index c329736221f..bc0295b7789 100644
--- a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
+++ b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+name: "count_distinct_user_id_from_<adjective describing: '(clusters.provider_type = 2 AND (cluster_providers_aws.status IN (3)) AND clusters.enabled = TRUE)'>_clusters_<with>_<adjective describing: '(clusters.provider_type = 2 AND (cluster_providers_aws.status IN (3)) AND clusters.enabled = TRUE)'>_cluster_providers_aws"
diff --git a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
index c1ae40b9533..9dd10c58008 100644
--- a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
+++ b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+name: "count_distinct_user_id_from_<adjective describing: '(clusters.provider_type = 0 AND clusters.enabled = TRUE)'>_clusters"
diff --git a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
index b28301a9ff0..30122b3d997 100644
--- a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = FALSE AND clusters.cluster_type = 1)'>_clusters"
diff --git a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
index 182cbcdea07..12007dd131d 100644
--- a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = TRUE AND clusters.cluster_type = 1)'>_clusters"
diff --git a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
index 7dd10ffcc1a..5a43620e0f5 100644
--- a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = FALSE AND clusters.cluster_type = 2)'>_clusters"
diff --git a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
index b49046220a2..443beb46493 100644
--- a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = TRUE AND clusters.cluster_type = 2)'>_clusters"
diff --git a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
index 65cfbc57e82..cc04c03244c 100644
--- a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = FALSE AND clusters.cluster_type = 3)'>_clusters"
diff --git a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
index dd17be3d69a..319fcec57c7 100644
--- a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = TRUE AND clusters.cluster_type = 3)'>_clusters"
diff --git a/config/metrics/counts_28d/20210216181139_issues.yml b/config/metrics/counts_28d/20210216181139_issues.yml
index 6412720342f..46494caaff7 100644
--- a/config/metrics/counts_28d/20210216181139_issues.yml
+++ b/config/metrics/counts_28d/20210216181139_issues.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.plan.issues
-description:
+description: Count of MAU creating issues
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: plan 
+product_group: group::project management
+product_category: issue_tracking 
 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/20210216181141_notes.yml b/config/metrics/counts_28d/20210216181141_notes.yml
index d33a4c6ef9c..0245705cd8e 100644
--- a/config/metrics/counts_28d/20210216181141_notes.yml
+++ b/config/metrics/counts_28d/20210216181141_notes.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.plan.notes
-description:
+description: Count of MAU commenting on an issuable
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
 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/20210216181143_projects.yml b/config/metrics/counts_28d/20210216181143_projects.yml
index 36da5428dce..6dd113bb25a 100644
--- a/config/metrics/counts_28d/20210216181143_projects.yml
+++ b/config/metrics/counts_28d/20210216181143_projects.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.plan.projects
-description:
+description: Count of MAU creating projects
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: plan 
+product_group: group::project management
+product_category: projects
 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/20210216181145_todos.yml b/config/metrics/counts_28d/20210216181145_todos.yml
index 224711942e8..89378b26bcd 100644
--- a/config/metrics/counts_28d/20210216181145_todos.yml
+++ b/config/metrics/counts_28d/20210216181145_todos.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.plan.todos
-description:
+description: Count of MAU creating todos
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
 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/20210216181200_label_lists.yml b/config/metrics/counts_28d/20210216181200_label_lists.yml
index 1c2ad77bdbb..768692dc39a 100644
--- a/config/metrics/counts_28d/20210216181200_label_lists.yml
+++ b/config/metrics/counts_28d/20210216181200_label_lists.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.plan.label_lists
-description:
+description: Count of MAU creating label lists on Boards
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: plan
+product_group: group::project management 
+product_category: boards 
 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/20210216181201_milestone_lists.yml b/config/metrics/counts_28d/20210216181201_milestone_lists.yml
deleted file mode 100644
index 8a83f9c8930..00000000000
--- a/config/metrics/counts_28d/20210216181201_milestone_lists.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.plan.milestone_lists
-description:
-product_section: dev
-product_stage:
-product_group: group::plan
-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/20210216181304_g_project_management_issue_title_changed_monthly.yml b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
index f7216281bf3..85406b7bf4f 100644
--- a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
@@ -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/20210216181308_g_project_management_issue_description_changed_monthly.yml b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
index a5bc2a9dad6..4fe2a89c7f9 100644
--- a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
@@ -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/20210216181341_g_project_management_issue_iteration_changed_monthly.yml b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
index 1a0600278a5..6065495beb2 100644
--- a/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
@@ -1,6 +1,6 @@
 ---
-key_path: redis_hll_counters.issues_edit.g_project_management_issue_iteration_changed_monthly
-description: Count of MAU changing an issue's iteration
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_assignee_changed_monthly
+description: Count of MAU changing issue assignees
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -10,7 +10,10 @@ status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
-- ce
+- ce 
+- ee 
 tier:
-- free
-skip_validation: true
+- free 
+- premium 
+- ultimate 
+
diff --git a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
index 0f5ab506a14..10f8355d374 100644
--- a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
@@ -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/20210216181319_g_project_management_issue_made_visible_monthly.yml b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
index 21170e50629..1f45e47cec2 100644
--- a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
+++ b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
@@ -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/20210216181323_g_project_management_issue_created_monthly.yml b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
index 9236d49731d..de02fe709f7 100644
--- a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
@@ -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/20210216181326_g_project_management_issue_closed_monthly.yml b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
index 01f3cadf87a..9ac69cadc00 100644
--- a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
@@ -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/20210216181330_g_project_management_issue_reopened_monthly.yml b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
index 0234b46775b..e47c00a0f88 100644
--- a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
@@ -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/20210216181334_g_project_management_issue_label_changed_monthly.yml b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
index d72fa3135bd..75a530e5e6e 100644
--- a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
@@ -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/20210216181337_g_project_management_issue_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
index 85e66885ef5..76bdbaf4401 100644
--- a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
@@ -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/20210216181348_g_project_management_issue_cross_referenced_monthly.yml b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
index 1f28ae1b252..f2f96164882 100644
--- a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
+++ b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
@@ -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/20210216181352_g_project_management_issue_moved_monthly.yml b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
index a8e6e0e75a1..684a8d31157 100644
--- a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
+++ b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
@@ -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/20210216181356_g_project_management_issue_related_monthly.yml b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
index 89f74760440..0058a6eece9 100644
--- a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
+++ b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
@@ -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/20210216181400_g_project_management_issue_unrelated_monthly.yml b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
index 6700f5d2763..c735eb37ab2 100644
--- a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
+++ b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
@@ -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/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
index 2023d5900c1..25dd972385c 100644
--- a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
@@ -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/20210216181407_g_project_management_issue_locked_monthly.yml b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
index 41b7b6b1737..5a9b44afff2 100644
--- a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
@@ -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/20210216181411_g_project_management_issue_unlocked_monthly.yml b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
index 7be27b6fa65..ab09a496a88 100644
--- a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_unlocked_monthly
-description: Count of MAU marking an issue as blocked or blocked by
+description: Count of MAU unlocking an issue
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -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/20210216181424_g_project_management_issue_designs_added_monthly.yml b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
index 29c0f3ef7d8..d57db3474a3 100644
--- a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
@@ -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/20210216181427_g_project_management_issue_designs_modified_monthly.yml b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
index 30925229543..5447112e8fb 100644
--- a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
+++ b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
@@ -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/20210216181431_g_project_management_issue_designs_removed_monthly.yml b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
index cd346847a02..76612a2fdc7 100644
--- a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
@@ -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/20210216181435_g_project_management_issue_due_date_changed_monthly.yml b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
index 0b0a7dc3b8b..4b6c2dadbcf 100644
--- a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
@@ -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/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
index ee67b5db3c1..13bfaaac98b 100644
--- a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
@@ -4,13 +4,15 @@ description: Count of MAU changing an issue time estimate
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking
+product_category: time_tracking
 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/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
index fa356f4e3d6..09cb3fdfbf7 100644
--- a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
@@ -4,13 +4,15 @@ description: Count of MAU recording time spent on an issue
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking
+product_category: time_tracking
 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/20210216181446_g_project_management_issue_comment_added_monthly.yml b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
index 6c1d26be10f..2a62d55940f 100644
--- a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
@@ -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/20210216181450_g_project_management_issue_comment_edited_monthly.yml b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
index 390401de267..a6c7e3d5c90 100644
--- a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
@@ -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/20210216181453_g_project_management_issue_comment_removed_monthly.yml b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
index 78f08de6f22..feacebfdd47 100644
--- a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
@@ -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/20210216181501_g_project_management_issue_cloned_monthly.yml b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
index 5e2ddaa0ec3..69159563527 100644
--- a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
+++ b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_cloned_monthly
-description:
+description: Count of MAU cloning an issue
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181504_issues_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
index cbb391035c3..a100a5bebe7 100644
--- a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.issues_edit.issues_edit_total_unique_counts_monthly
-description: Count of MAU taking an action related to an issue
+description: Aggregate count of MAU taking an action related to an issue
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -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/20210216181508_i_quickactions_approve_monthly.yml b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
index 8115da08fd6..b1009642dcc 100644
--- a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
+++ b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_approve_monthly
-description:
+description: Count of MAU using the `/approve` quick action
 product_section: dev
-product_stage: plan
-product_group: group::project management
-product_category:
+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
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
index ad94a07ca5b..e0922256104 100644
--- a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
+++ b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_single_monthly
-description:
+description: Count of MAU using the `/assign @user1` quick action to assign a single individual to an issuable 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181519_i_quickactions_assign_self_monthly.yml b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
index 378a22daa87..7c5303ecd8f 100644
--- a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
+++ b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_self_monthly
-description:
+description: Count of MAU using the `/assign me` quick action to assign self to an issuable 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181523_i_quickactions_assign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
index 39142f74dc1..bcf7a415138 100644
--- a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_reviewer_monthly
-description:
+description: Count of MAU using the `/assign_reviewer` or `request_reviewer` quick action
 product_section: dev
-product_stage: plan
-product_group: group::project management
-product_category:
+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
+- premium 
+- ultimate
diff --git a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
index 7d728bbc794..8ea3318bc0c 100644
--- a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
+++ b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_award_monthly
-description:
+description: Count of MAU using the `/award` quick action to set an award emoji on an issuable 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181530_i_quickactions_board_move_monthly.yml b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
index 141ba7237d8..6baaabf7672 100644
--- a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_board_move_monthly
-description:
+description: Count of MAU using the `/board_move` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181534_i_quickactions_child_epic_monthly.yml b/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml
deleted file mode 100644
index 5adcb8b0f27..00000000000
--- a/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.quickactions.i_quickactions_child_epic_monthly
-description:
-product_section: dev
-product_stage: plan
-product_group: group::project management
-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/20210216181538_i_quickactions_clear_weight_monthly.yml b/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml
deleted file mode 100644
index a13f3d322ff..00000000000
--- a/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.quickactions.i_quickactions_clear_weight_monthly
-description:
-product_section: dev
-product_stage: plan
-product_group: group::project management
-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/20210216181541_i_quickactions_clone_monthly.yml b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
index ca22455151e..51c2b562057 100644
--- a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_clone_monthly
-description:
+description: Count of MAU using the `/clone` quick action to clone an issue.
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181545_i_quickactions_close_monthly.yml b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
index c10b3fe8107..be0524b633c 100644
--- a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
+++ b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_close_monthly
-description:
+description: Count of MAU using the `/close` quick action to close an issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181549_i_quickactions_confidential_monthly.yml b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
index d3bc2162c89..9fa5af8c7c0 100644
--- a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_confidential_monthly
-description:
+description: Count of MAU using the `/confidential` quick action to set an issue as confidential
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
index a2d6b975753..cbd8aa83010 100644
--- a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_merge_request_monthly
-description:
+description: Count of MAU using the `/copy_metadata` quick action on a Merge Request
 product_section: dev
-product_stage: plan
-product_group: group::project management
-product_category:
+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/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
index 23adb6a769c..3075ed64103 100644
--- a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_issue_monthly
-description:
+description: Count of MAU using the `/copy_metadata` quick action on an issue
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181600_i_quickactions_create_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
index 43b4cff5c11..9a83fe2b6e4 100644
--- a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
@@ -1,16 +1,19 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_create_merge_request_monthly
-description:
+description: Count of MAU using the `/create_merge_request` quick action 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181604_i_quickactions_done_monthly.yml b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
index b7ac9de7655..9a90dc7a972 100644
--- a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
+++ b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_done_monthly
-description:
+description: Count of MAU using the `/done` quick action to mark a todo as done
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181607_i_quickactions_draft_monthly.yml b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
index 4d88092cd72..778c15ac26b 100644
--- a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_draft_monthly
-description:
+description: Count of MAU using the `/draft` quick action on a Merge Request
 product_section: dev
-product_stage: plan
-product_group: group::project management
-product_category:
+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/20210216181611_i_quickactions_due_monthly.yml b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
index 0fd293e1bb9..2c785a8653a 100644
--- a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
+++ b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_due_monthly
-description:
+description: Count of MAU using the `/due` quick action to change the due date on an issuable 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181615_i_quickactions_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
index 1d5750e5b43..68b668e7fc1 100644
--- a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_duplicate_monthly
-description:
+description: Count of MAU using the `/duplicate` quick action to mark an issue as a duplicate of another
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181618_i_quickactions_epic_monthly.yml b/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml
deleted file mode 100644
index 0b448b0d3a1..00000000000
--- a/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.quickactions.i_quickactions_epic_monthly
-description:
-product_section: dev
-product_stage: plan
-product_group: group::project management
-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/20210216181622_i_quickactions_estimate_monthly.yml b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
index b509c7ed358..a14340571a6 100644
--- a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_estimate_monthly
-description:
+description: Count of MAU using the `/estimate` quick action to set a time estimate on an issue
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: time_tracking 
 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/20210216181626_i_quickactions_iteration_monthly.yml b/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml
deleted file mode 100644
index 5759c131771..00000000000
--- a/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.quickactions.i_quickactions_iteration_monthly
-description:
-product_section: dev
-product_stage: plan
-product_group: group::project management
-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/20210216181629_i_quickactions_label_monthly.yml b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
index 52d99012a45..d078d4bc7ce 100644
--- a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
+++ b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_label_monthly
-description:
+description: Count of MAU using the `/label` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181633_i_quickactions_lock_monthly.yml b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
index 552748c4f2c..5be644e630f 100644
--- a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_lock_monthly
-description:
+description: Count of MAU using the `/lock` quick action 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181637_i_quickactions_merge_monthly.yml b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
index 71488207321..8dcdee2b041 100644
--- a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
+++ b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_merge_monthly
-description:
+description: Count of MAU using the `/merge` quick action
 product_section: dev
-product_stage: plan
-product_group: group::project management
-product_category:
+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/20210216181641_i_quickactions_milestone_monthly.yml b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
index 65a466c4bf9..bb1b0d332fd 100644
--- a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_milestone_monthly
-description:
-product_section: dev
+description: Count of MAU using the `/milestone` quick action 
+product_section: dev 
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181644_i_quickactions_move_monthly.yml b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
index df657e463ba..30c1794a4a1 100644
--- a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_move_monthly
-description:
+description: Count of MAU using the `/move` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181648_i_quickactions_parent_epic_monthly.yml b/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml
deleted file mode 100644
index 2dbd62415f2..00000000000
--- a/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.quickactions.i_quickactions_parent_epic_monthly
-description:
-product_section: dev
-product_stage: plan
-product_group: group::project management
-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/20210216181652_i_quickactions_promote_monthly.yml b/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml
deleted file mode 100644
index b4fe23e7d95..00000000000
--- a/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.quickactions.i_quickactions_promote_monthly
-description:
-product_section: dev
-product_stage: plan
-product_group: group::project management
-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/20210216181655_i_quickactions_publish_monthly.yml b/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
deleted file mode 100644
index c4d79fc2e11..00000000000
--- a/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.quickactions.i_quickactions_publish_monthly
-description:
-product_section: dev
-product_stage: plan
-product_group: group::project management
-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/20210216181659_i_quickactions_reassign_monthly.yml b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
index 1043901a415..8672b1aa7b8 100644
--- a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
+++ b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_reassign_monthly
-description:
+description: Count of MAU using the `/reassign @user1` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181703_i_quickactions_reassign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
index 23041ca9a37..5ac680311f3 100644
--- a/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_reassign_reviewer_monthly
-description:
+description: Count of MAU using the `/reassign_reviewer` quick action
 product_section: dev
-product_stage: plan
-product_group: group::project management
-product_category:
+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
+- premium 
+- ultimate
diff --git a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
index fcdf21bf28e..16c1cbd1360 100644
--- a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
+++ b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_rebase_monthly
-description:
+description: Count of MAU using the `/rebase` quick action on a Merge Request
 product_section: dev
-product_stage: plan
-product_group: group::project management
-product_category:
+product_stage: source_code 
+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/20210216181710_i_quickactions_relabel_monthly.yml b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
index f285b5fc3f6..0d8cbf4fb0b 100644
--- a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
+++ b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_relabel_monthly
-description:
+description: Count of MAU using the `/relabel` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181714_i_quickactions_relate_monthly.yml b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
index afc8fc3e800..9faa26a1236 100644
--- a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_relate_monthly
-description:
+description: Count of MAU using the `/relate` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181721_i_quickactions_remove_due_date_monthly.yml b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
index 5a75d6b7a24..d322615104d 100644
--- a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
+++ b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_due_date_monthly
-description:
+description: Count of MAU using the `/remove_due_date` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181729_i_quickactions_remove_estimate_monthly.yml b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
index 6b3ff3b44e4..013ae8790a1 100644
--- a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_estimate_monthly
-description:
+description: Count of MAU using the `/remove_estimate` quick action 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: time_tracking 
 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/20210216181736_i_quickactions_remove_milestone_monthly.yml b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
index 2ee78d245f9..c3faaf91c0a 100644
--- a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_milestone_monthly
-description:
+description: Count of MAU using the `/remove_milestone` quick action 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181744_i_quickactions_remove_time_spent_monthly.yml b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
index 3ecaaa970f0..204c3369837 100644
--- a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
+++ b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_time_spent_monthly
-description:
+description: Count of MAU using the `/remove_time_spent` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181747_i_quickactions_remove_zoom_monthly.yml b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
index bb42563e34c..fcc04db33b8 100644
--- a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_zoom_monthly
-description:
+description: Count of MAU using the `/remove_zoom` quick action 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181751_i_quickactions_reopen_monthly.yml b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
index eea7e3672ea..863c61968af 100644
--- a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
+++ b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_reopen_monthly
-description:
+description: Count of MAU using the `/reopen` quick action 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181755_i_quickactions_shrug_monthly.yml b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
index 302cad17efd..0c4f6733999 100644
--- a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
+++ b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_shrug_monthly
-description:
+description: Count of MAU using the `/shrug` quick action 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181758_i_quickactions_spend_subtract_monthly.yml b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
index 01d87e2e8fb..74d8e8e7ad3 100644
--- a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
+++ b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_subtract_monthly
-description:
+description: Count of MAU using the `/spend` quick action to subtract time spent 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: time_tracking 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee 
 tier:
 - free
-skip_validation: true
+- premium 
+- ultimate
\ No newline at end of file
diff --git a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
index e80f988cf7a..619996168d2 100644
--- a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
+++ b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_add_monthly
-description:
+description: Count of MAU using the `/spend` quick action to add time spent 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181806_i_quickactions_submit_review_monthly.yml b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
index 61077b79a6f..3708266fd04 100644
--- a/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_submit_review_monthly
-description:
+description: Count of MAU using the `/submit_review` quick action on Merge Requests
 product_section: dev
-product_stage: plan
-product_group: group::project management
-product_category:
+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
+- premium 
+- ultimate 
diff --git a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
index 20934358839..be39d3c91c6 100644
--- a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_subscribe_monthly
-description:
+description: Count of MAU using the `/subscribe` quick action 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181813_i_quickactions_tableflip_monthly.yml b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
index a390fb11746..6c1f138971f 100644
--- a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_tableflip_monthly
-description:
+description: Count of MAU using the `/tableflip` quick action 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee 
 tier:
 - free
-skip_validation: true
+- premium 
+- ultimate
\ No newline at end of file
diff --git a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
index f8f078f5f27..2acae16666a 100644
--- a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
+++ b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_tag_monthly
-description:
+description: Count of MAU using the `/tag` quick action 
 product_section: dev
-product_stage: plan
-product_group: group::project management
-product_category:
+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/20210216181821_i_quickactions_target_branch_monthly.yml b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
index dd730656292..e0d0c008b72 100644
--- a/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
+++ b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_target_branch_monthly
-description:
+description: Count of MAU using the `/target_branch` quick action on Merge Requests
 product_section: dev
-product_stage: plan
-product_group: group::project management
-product_category:
+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/20210216181824_i_quickactions_title_monthly.yml b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
index ea3e2179ba6..3caea4e2eb5 100644
--- a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_title_monthly
-description:
+description: Count of MAU using the `/title` quick action 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181828_i_quickactions_todo_monthly.yml b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
index f50c85bcb2d..cff94935c33 100644
--- a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_todo_monthly
-description:
+description: Count of MAU using the `/todo` quick action 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216181832_i_quickactions_unassign_specific_monthly.yml b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
index c17a807aaee..d2924129056 100644
--- a/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_unassign_specific_monthly
-description:
+description: Count of MAU using the `/unassign @user1` quick action on Merge Requests
 product_section: dev
-product_stage: plan
-product_group: group::project management
-product_category:
+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/20210216181835_i_quickactions_unassign_all_monthly.yml b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
index 294dd992bf0..da7317161c8 100644
--- a/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_unassign_all_monthly
-description:
+description: Count of MAU using the `/unassign` quick action on Merge Requests
 product_section: dev
-product_stage: plan
-product_group: group::project management
-product_category:
+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/20210216181839_i_quickactions_unassign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
index a264457a478..f807469caf6 100644
--- a/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_unassign_reviewer_monthly
-description:
+description: Count of MAU using the `/unassign_reviewer` or `/remove_reviewer` quick action on Merge Requests
 product_section: dev
-product_stage: plan
-product_group: group::project management
-product_category:
+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
+- premium 
+- ultimate
diff --git a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
index c4c9dc56cfd..3e33f8ce3a1 100644
--- a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_specific_monthly
-description:
+description: Count of MAU using the `/unlabel` or `/remove_label` quick action to remove one or more specific labels
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181846_i_quickactions_unlabel_all_monthly.yml b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
index 45c44218cbd..f32c83f940e 100644
--- a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_all_monthly
-description:
+description: Count of MAU using the `/unlabel` quick action to remove all labels
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181850_i_quickactions_unlock_monthly.yml b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
index b9edfa92c20..bb1b636661d 100644
--- a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_unlock_monthly
-description:
+description: Count of MAU using the `/unlock` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181854_i_quickactions_unsubscribe_monthly.yml b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
index d54e8a4ab85..c3461c4f015 100644
--- a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_unsubscribe_monthly
-description:
+description: Count of MAU using the `/unsubscribe` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 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/20210216181857_i_quickactions_weight_monthly.yml b/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml
deleted file mode 100644
index 68caac40ead..00000000000
--- a/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.quickactions.i_quickactions_weight_monthly
-description:
-product_section: dev
-product_stage: plan
-product_group: group::project management
-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/20210216181901_i_quickactions_wip_monthly.yml b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
index 419af8a68ee..e85ddf9bf2b 100644
--- a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_wip_monthly
-description:
+description: Count of MAU using the `/wip` quick action on Merge Requests
 product_section: dev
-product_stage: plan
-product_group: group::project management
-product_category:
+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/20210216181905_i_quickactions_zoom_monthly.yml b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
index 0af363b6429..03df4769081 100644
--- a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_zoom_monthly
-description:
+description: Count of MAU using the `/zoom` quick action on Issues 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 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/20210216182136_i_testing_test_case_parsed_monthly.yml b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
index 15369757cb8..fa4b6b14946 100644
--- a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
+++ b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml b/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml
deleted file mode 100644
index 1a475b19f01..00000000000
--- a/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-key_path: redis_hll_counters.testing.i_testing_metrics_report_artifact_uploaders_monthly
-description: Internal Tracking to count number of unit tests parsed for planning of
-  future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
-product_section: ops
-product_stage: verify
-product_group: group::testing
-product_category: code_testing
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-- ee
-tier:
-- free
-- premium
-- ultimate
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182209_user_preferences_group_overview_security_dashboard.yml b/config/metrics/counts_28d/20210216182209_user_preferences_group_overview_security_dashboard.yml
deleted file mode 100644
index bf1315b9e50..00000000000
--- a/config/metrics/counts_28d/20210216182209_user_preferences_group_overview_security_dashboard.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.secure.user_preferences_group_overview_security_dashboard
-description: Users who set personal preference to see Security Dashboard on Group
-  overview page
-product_section: sec
-product_stage: secure
-product_group: group::threat insights
-product_category: vulnerability_management
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-- ee
-tier:
-- ultimate
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
index f4723c2b5a1..1f9832b220d 100644
--- a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
+++ b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
@@ -1,16 +1,21 @@
 ---
 key_path: counts_monthly.aggregated_metrics.product_analytics_test_metrics_union
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
 value_type: number
-status: data_available
-time_frame: 28d
-data_source: database
+status: removed
+milestone_removed: '13.11'
+milestone: '13.7'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49886
+time_frame: 7d
+data_source: redis_hll
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
index fe8073f3f33..171b2a0a032 100644
--- a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
+++ b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
@@ -1,16 +1,21 @@
 ---
 key_path: counts_monthly.aggregated_metrics.product_analytics_test_metrics_intersection
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.11'
+milestone: '13.7'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49886
 time_frame: 28d
-data_source: database
+data_source: redis_hll
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml b/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
deleted file mode 100644
index 367cfb77c09..00000000000
--- a/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts_monthly.aggregated_metrics.i_testing_paid_monthly_active_user_total
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
index 12d51d8d560..381f691fe27 100644
--- a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
@@ -6,11 +6,10 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: data_available
+status: removed
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
index 59771f0f021..a052c79584e 100644
--- a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.quickactions.quickactions_total_unique_counts_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of MAU using one or more quick actions
+product_section: dev
+product_stage: plan 
+product_group: group::project management 
+product_category: issue_tracking 
 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/20210222041219_i_quickactions_invite_email_single_monthly.yml b/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
index 72297a39264..3541c7d48ef 100644
--- a/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
+++ b/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
@@ -6,7 +6,7 @@ product_stage: plan
 product_group: group::product planning
 product_category: issue_tracking
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49264
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml b/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
index b64a08cb0c2..c4848444e75 100644
--- a/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
+++ b/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
@@ -6,7 +6,7 @@ product_stage: plan
 product_group: group::product planning
 product_category: issue_tracking
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49264
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
index 69ad9237f0d..902c9162456 100644
--- a/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55046
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
index 36972b7e168..b98fa24a789 100644
--- a/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55046
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml b/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
index 9ad7ff81231..109bf35b1c6 100644
--- a/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55069
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml b/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
index 707a2fc76d1..1bf8d97ea59 100644
--- a/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55069
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
index b67a8c521a9..2bc3ff7d2e1 100644
--- a/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
+++ b/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
@@ -6,7 +6,7 @@ product_stage: verify
 product_group: group::pipeline authoring
 product_category: pipeline_authoring
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54707
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
index 4edc596dca1..9008de987e8 100644
--- a/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55484
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml b/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
index 713473cc832..883eb32feb5 100644
--- a/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55484
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml b/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
index 83d06db1fb3..30d410e4b57 100644
--- a/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55486
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml b/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
index 9cf18201916..b7093d8c0c5 100644
--- a/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55486
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml b/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
index 300968b4959..164d37d88e0 100644
--- a/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml b/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
index 5db875af686..ccf82319d9d 100644
--- a/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml b/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
index b551a1bdfc4..5333e2b7951 100644
--- a/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml b/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
index 90c1b0a36ef..89004523ce3 100644
--- a/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml b/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
index 983b3e4453c..8b12cd29ae4 100644
--- a/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml b/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
index 452a4c1258c..49037eeb57f 100644
--- a/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml b/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
index 0bc4def1b9c..166176b2026 100644
--- a/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml b/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
index 3de56f4b328..9092e7696c5 100644
--- a/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml b/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
index 247b7b8c406..968ac5734cb 100644
--- a/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
new file mode 100644
index 00000000000..0d0318a02c6
--- /dev/null
+++ b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.secure.users_expanding_secure_security_report_monthly
+description: Count of expanding the security report widget
+product_section: sec
+product_stage: secure
+product_group: group::static analysis
+product_category: dependency_scanning
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
new file mode 100644
index 00000000000..00d1249d0f9
--- /dev/null
+++ b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.testing.users_expanding_testing_code_quality_report_monthly
+description: Count of expanding the code quality widget
+product_section: ops
+product_stage: verify
+product_group: group::testing
+product_category: code_quality
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
new file mode 100644
index 00000000000..2b9136fde62
--- /dev/null
+++ b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.testing.users_expanding_testing_accessibility_report_monthly
+description: Count of expanding the accessibility report widget
+product_section: ops
+product_stage: verify
+product_group: group::testing
+product_category: accessibility_testing
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
new file mode 100644
index 00000000000..a6186d44698
--- /dev/null
+++ b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.testing.i_testing_summary_widget_total_monthly
+description: Unique users that expand the test summary merge request widget by month
+product_section: ops
+product_stage: verify
+product_group: group::testing
+product_category: testing
+value_type: number
+status: implemented
+milestone: "13.11"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59316
+time_frame: 28d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
index 21612fe87f5..6b8e1976ce0 100644
--- a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
@@ -1,7 +1,6 @@
 ---
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_weekly
-description: Distinct users count that changed issue title in a group for last recent
-  week
+description: Count of WAU editing an issue title
 product_stage: plan
 product_group: group::project management
 product_category: issue_tracking
diff --git a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
new file mode 100644
index 00000000000..71983a1ddb4
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_description_changed_weekly
+description: Count of WAU editing an issue description
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181310_g_project_management_issue_assignee_changed_weekly.yml b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
new file mode 100644
index 00000000000..9c75d0b6b63
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_assignee_changed_weekly
+description: Count of WAU changing issue assignees
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181313_g_project_management_issue_made_confidential_weekly.yml b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
new file mode 100644
index 00000000000..36ee2fae2de
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_confidential_weekly
+description: Count of WAU making an issue confidential
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181317_g_project_management_issue_made_visible_weekly.yml b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
new file mode 100644
index 00000000000..fb9f7841d7c
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_visible_weekly
+description: Count of WAU making an issue not confidential
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181414_g_project_management_issue_added_to_epic_monthly.yml b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
index 8a69fafc2b2..986015c578d 100644
--- a/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml
+++ b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
@@ -1,16 +1,18 @@
 ---
-key_path: redis_hll_counters.issues_edit.g_project_management_issue_added_to_epic_monthly
-description: Count of MAU adding an issue to an epic
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_created_weekly
+description: Count of WAU creating issues
 product_section: dev
 product_stage: plan
 product_group: group::project management
 product_category: issue_tracking
 value_type: number
 status: data_available
-time_frame: 28d
+time_frame: 7d
 data_source: redis_hll
 distribution:
 - ce
+- ee 
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
index 6d94de26e26..41ce86d5862 100644
--- a/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml
+++ b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
@@ -1,16 +1,19 @@
 ---
-key_path: redis_hll_counters.issues_edit.g_project_management_issue_weight_changed_monthly
-description: Count of MAU changing an issue's weight
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_closed_weekly
+description: Count of WAU closing an issue
 product_section: dev
 product_stage: plan
 product_group: group::project management
 product_category: issue_tracking
 value_type: number
 status: data_available
-time_frame: 28d
+time_frame: 7d
 data_source: redis_hll
 distribution:
 - ce
+- ee 
 tier:
 - free
-skip_validation: true
+- premium 
+- ultimate
+
diff --git a/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
index a269681d4dd..d276e45bc64 100644
--- a/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml
+++ b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
@@ -1,16 +1,18 @@
 ---
-key_path: redis_hll_counters.issues_edit.g_project_management_issue_changed_epic_monthly
-description: Count of MAU changing the epic on an issue
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_reopened_weekly
+description: Count of WAU re-opening a closed issue
 product_section: dev
 product_stage: plan
 product_group: group::project management
 product_category: issue_tracking
 value_type: number
 status: data_available
-time_frame: 28d
+time_frame: 7d
 data_source: redis_hll
 distribution:
 - ce
+- ee 
 tier:
 - free
-skip_validation: true
+- premium 
+- ultimate
diff --git a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
new file mode 100644
index 00000000000..64a0f936ec6
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_label_changed_weekly
+description: Count of WAU changing an issue's label
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181336_g_project_management_issue_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
new file mode 100644
index 00000000000..b793fde042b
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_milestone_changed_weekly
+description: Count of WAU changing an issue's milestone
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
\ No newline at end of file
diff --git a/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
index 4ae21d8852e..2dcc0eddc56 100644
--- a/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml
+++ b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
@@ -1,6 +1,6 @@
 ---
-key_path: redis_hll_counters.issues_edit.g_project_management_issue_removed_from_epic_monthly
-description: Count of MAU removing an issue from an epic
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_cross_referenced_weekly
+description: Count of WAU referencing an issue from somewhere else
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -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_7d/20210216181350_g_project_management_issue_moved_weekly.yml b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
new file mode 100644
index 00000000000..3be8f0646e7
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_moved_weekly
+description: Count of WAU moving an issue to another project
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181354_g_project_management_issue_related_weekly.yml b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
new file mode 100644
index 00000000000..b4fb4d5bd63
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_related_weekly
+description: Count of WAU relating an issue to another issue
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181358_g_project_management_issue_unrelated_weekly.yml b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
new file mode 100644
index 00000000000..7f2f70411dc
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_unrelated_weekly
+description: Count of WAU unrelating an issue to another issue
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
new file mode 100644
index 00000000000..791fc680ac0
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_marked_as_duplicate_weekly
+description: Count of WAU marking an issue as a duplicate
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181405_g_project_management_issue_locked_weekly.yml b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
new file mode 100644
index 00000000000..9afa4daf268
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_locked_weekly
+description: Count of WAU locking an issue
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181409_g_project_management_issue_unlocked_weekly.yml b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
new file mode 100644
index 00000000000..6de0bc2168c
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_unlocked_weekly
+description: Count of WAU unlocking an issue
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181422_g_project_management_issue_designs_added_weekly.yml b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
new file mode 100644
index 00000000000..73ec2542682
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_added_weekly
+description: Count of WAU adding a design to an issue
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181425_g_project_management_issue_designs_modified_weekly.yml b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
new file mode 100644
index 00000000000..b1e6d34c412
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_modified_weekly
+description: Count of WAU modifying a design on an issue
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181429_g_project_management_issue_designs_removed_weekly.yml b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
new file mode 100644
index 00000000000..51f3f6584b6
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_removed_weekly
+description: Count of WAU removing a design from an issue
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181433_g_project_management_issue_due_date_changed_weekly.yml b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
new file mode 100644
index 00000000000..2a699bc67d5
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_due_date_changed_weekly
+description: Count of WAU changing an issue due date
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
new file mode 100644
index 00000000000..1457453aa04
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_estimate_changed_weekly
+description: Count of WAU changing an issue time estimate
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
new file mode 100644
index 00000000000..eacf55f9984
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_spent_changed_weekly
+description: Count of WAU recording time spent on an issue
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181444_g_project_management_issue_comment_added_weekly.yml b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
new file mode 100644
index 00000000000..7f8bfa07f0a
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_added_weekly
+description: Count of WAU commenting on an issue
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181448_g_project_management_issue_comment_edited_weekly.yml b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
new file mode 100644
index 00000000000..4f1c6f2e576
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_edited_weekly
+description: Count of WAU editing a comment on an issue
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181451_g_project_management_issue_comment_removed_weekly.yml b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
new file mode 100644
index 00000000000..7802ebf2d97
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_removed_weekly
+description: Count of WAU deleting a comment from an issue
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181459_g_project_management_issue_cloned_weekly.yml b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
new file mode 100644
index 00000000000..0023d75bf4c
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_cloned_weekly
+description: Count of WAU cloning an issue
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
\ No newline at end of file
diff --git a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
new file mode 100644
index 00000000000..59d0779c7d4
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.issues_edit.issues_edit_total_unique_counts_weekly
+description: Aggregate count of WAU taking an action related to an issue
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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
new file mode 100644
index 00000000000..f8c48ac20f9
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_approve_weekly
+description: Count of WAU using the `/approve` quick action
+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
\ No newline at end of file
diff --git a/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
new file mode 100644
index 00000000000..edc9becd5fb
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_assign_single_weekly
+description: Count of WAU using the `/assign @user1` quick action to assign a single individual to an issuable 
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181516_i_quickactions_assign_multiple_monthly.yml b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
index 8db1e881bd4..d92701b864c 100644
--- a/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
+++ b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
@@ -1,16 +1,18 @@
 ---
-key_path: redis_hll_counters.quickactions.i_quickactions_assign_multiple_monthly
-description:
+key_path: redis_hll_counters.quickactions.i_quickactions_assign_self_weekly
+description: Count of WAU using the `/assign me` quick action to assign self to an issuable 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 value_type: number
 status: data_available
-time_frame: 28d
+time_frame: 7d
 data_source: redis_hll
 distribution:
 - ce
+- ee 
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
\ No newline at end of file
diff --git a/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
new file mode 100644
index 00000000000..51c3c4a61e0
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_assign_reviewer_weekly
+description: Count of WAU using the `/assign_reviewer` or `request_reviewer` quick action
+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/20210216181525_i_quickactions_award_weekly.yml b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
new file mode 100644
index 00000000000..fe5f5f3c9d5
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_award_weekly
+description: Count of WAU using the `/award` quick action to set an award emoji on an issuable 
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181529_i_quickactions_board_move_weekly.yml b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
new file mode 100644
index 00000000000..c8b4a45f7f9
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_board_move_weekly
+description: Count of WAU using the `/board_move` quick action
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181540_i_quickactions_clone_weekly.yml b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
new file mode 100644
index 00000000000..6a02c7721e9
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_clone_weekly
+description: Count of WAU using the `/clone` quick action to clone an issue.
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181543_i_quickactions_close_weekly.yml b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
new file mode 100644
index 00000000000..1afed34d3d2
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_close_weekly
+description: Count of WAU using the `/close` quick action to close an issuable
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181547_i_quickactions_confidential_weekly.yml b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
new file mode 100644
index 00000000000..9536278ed5c
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_confidential_weekly
+description: Count of WAU using the `/confidential` quick action to set an issue as confidential
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml b/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
new file mode 100644
index 00000000000..0661fda6954
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_merge_request_weekly
+description: Count of WAU using the `/copy_metadata` quick action on a Merge Request
+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/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
new file mode 100644
index 00000000000..42cb960a4ef
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_issue_weekly
+description: Count of WAU using the `/copy_metadata` quick action on an issue
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+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/20210216181558_i_quickactions_create_merge_request_weekly.yml b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
new file mode 100644
index 00000000000..9e94ec9940e
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_create_merge_request_weekly
+description: Count of WAU using the `/create_merge_request` quick action 
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+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/20210216181602_i_quickactions_done_weekly.yml b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
new file mode 100644
index 00000000000..bd5720ee00b
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_done_weekly
+description: Count of WAU using the `/done` quick action to mark a todo as done
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181605_i_quickactions_draft_weekly.yml b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
new file mode 100644
index 00000000000..4d324611eae
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_draft_weekly
+description: Count of WAU using the `/draft` quick action on a Merge Request
+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/20210216181609_i_quickactions_due_weekly.yml b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
new file mode 100644
index 00000000000..ba24c06603c
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_due_weekly
+description: Count of WAU using the `/due` quick action to change the due date on an issuable 
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181613_i_quickactions_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
new file mode 100644
index 00000000000..3ab9b124c2a
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_duplicate_weekly
+description: Count of WAU using the `/duplicate` quick action to mark an issue as a duplicate of another
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+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/20210216181620_i_quickactions_estimate_weekly.yml b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
new file mode 100644
index 00000000000..42b76831a0b
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_estimate_weekly
+description: Count of WAU using the `/estimate` quick action to set a time estimate on an issue
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: time_tracking 
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee 
+tier:
+- free
+- premium 
+- ultimate
\ No newline at end of file
diff --git a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
new file mode 100644
index 00000000000..b77a75d1a0e
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_label_weekly
+description: Count of WAU using the `/label` quick action
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+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/20210216181631_i_quickactions_lock_weekly.yml b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
new file mode 100644
index 00000000000..f2bfe3b8e2c
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_lock_weekly
+description: Count of WAU using the `/lock` quick action 
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee 
+tier:
+- free
+- premium 
+- ultimate
\ No newline at end of file
diff --git a/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
new file mode 100644
index 00000000000..5fdb11355f5
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_merge_weekly
+description: Count of WAU using the `/merge` quick action
+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/20210216181639_i_quickactions_milestone_weekly.yml b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
new file mode 100644
index 00000000000..c4e0e3606af
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_milestone_weekly
+description: Count of WAU using the `/milestone` quick action 
+product_section: dev 
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+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/20210216181642_i_quickactions_move_weekly.yml b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
new file mode 100644
index 00000000000..55559fb7715
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_move_weekly
+description: Count of WAU using the `/move` quick action
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181657_i_quickactions_reassign_weekly.yml b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
new file mode 100644
index 00000000000..d6f304bba5c
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_reassign_weekly
+description: Count of WAU using the `/reassign @user1` quick action
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+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/20210216181701_i_quickactions_reassign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
new file mode 100644
index 00000000000..f9347596f77
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_reassign_reviewer_weekly
+description: Count of WAU using the `/reassign_reviewer` quick action
+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/20210216181705_i_quickactions_rebase_weekly.yml b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
new file mode 100644
index 00000000000..73a99e63471
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_rebase_weekly
+description: Count of WAU using the `/rebase` quick action on a Merge Request
+product_section: dev
+product_stage: source_code 
+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/20210216181708_i_quickactions_relabel_weekly.yml b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
new file mode 100644
index 00000000000..5ffbd8904b1
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_relabel_weekly
+description: Count of WAU using the `/relabel` quick action
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+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/20210216181712_i_quickactions_relate_weekly.yml b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
new file mode 100644
index 00000000000..aa4ee33ff27
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_relate_weekly
+description: Count of WAU using the `/relate` quick action
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+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/20210216181732_i_quickactions_remove_iteration_monthly.yml b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
index 073539710e3..684b3aa9af5 100644
--- a/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml
+++ b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
@@ -1,16 +1,18 @@
 ---
-key_path: redis_hll_counters.quickactions.i_quickactions_remove_iteration_monthly
-description:
+key_path: redis_hll_counters.quickactions.i_quickactions_remove_due_date_weekly
+description: Count of WAU using the `/remove_due_date` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 value_type: number
 status: data_available
-time_frame: 28d
+time_frame: 7d
 data_source: redis_hll
 distribution:
 - ce
+- ee 
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
index 377f5e63c9b..5f25769f4da 100644
--- a/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml
+++ b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
@@ -1,16 +1,18 @@
 ---
-key_path: redis_hll_counters.quickactions.i_quickactions_remove_epic_monthly
-description:
+key_path: redis_hll_counters.quickactions.i_quickactions_remove_estimate_weekly
+description: Count of WAU using the `/remove_estimate` quick action 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: time_tracking 
 value_type: number
 status: data_available
-time_frame: 28d
+time_frame: 7d
 data_source: redis_hll
 distribution:
 - ce
+- ee 
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
\ No newline at end of file
diff --git a/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
new file mode 100644
index 00000000000..d2edc411e81
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_remove_milestone_weekly
+description: Count of WAU using the `/remove_milestone` quick action 
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+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/20210216181740_i_quickactions_remove_parent_epic_monthly.yml b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
index fffcbc6807d..0b0e1ef7c83 100644
--- a/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml
+++ b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
@@ -1,16 +1,18 @@
 ---
-key_path: redis_hll_counters.quickactions.i_quickactions_remove_parent_epic_monthly
-description:
+key_path: redis_hll_counters.quickactions.i_quickactions_remove_time_spent_weekly
+description: Count of WAU using the `/remove_time_spent` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking
 value_type: number
 status: data_available
-time_frame: 28d
+time_frame: 7d
 data_source: redis_hll
 distribution:
 - ce
+- ee 
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
index ad161fd2516..fdf9aac2687 100644
--- a/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml
+++ b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
@@ -1,16 +1,18 @@
 ---
-key_path: redis_hll_counters.quickactions.i_quickactions_remove_child_epic_monthly
-description:
+key_path: redis_hll_counters.quickactions.i_quickactions_remove_zoom_weekly
+description: Count of WAU using the `/remove_zoom` quick action 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: issue_tracking 
 value_type: number
 status: data_available
-time_frame: 28d
+time_frame: 7d
 data_source: redis_hll
 distribution:
 - ce
+- ee 
 tier:
 - free
-skip_validation: true
+- premium 
+- ultimate 
diff --git a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
new file mode 100644
index 00000000000..b566f3bed65
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_reopen_weekly
+description: Count of WAU using the `/reopen` quick action 
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181753_i_quickactions_shrug_weekly.yml b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
new file mode 100644
index 00000000000..f6d18267bfe
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_shrug_weekly
+description: Count of WAU using the `/shrug` quick action 
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+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/20210216181756_i_quickactions_spend_subtract_weekly.yml b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
new file mode 100644
index 00000000000..afadfd2bb13
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_spend_subtract_weekly
+description: Count of WAU using the `/spend` quick action to subtract time spent 
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: time_tracking 
+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/20210216181800_i_quickactions_spend_add_weekly.yml b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
new file mode 100644
index 00000000000..b826cfd2057
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_spend_add_weekly
+description: Count of WAU using the `/spend` quick action to add time spent 
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+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/20210216181804_i_quickactions_submit_review_weekly.yml b/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
new file mode 100644
index 00000000000..55848c908da
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_submit_review_weekly
+description: Count of WAU using the `/submit_review` quick action on Merge Requests
+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/20210216181808_i_quickactions_subscribe_weekly.yml b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
new file mode 100644
index 00000000000..8fbe345f451
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_subscribe_weekly
+description: Count of WAU using the `/subscribe` quick action 
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+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/20210216181811_i_quickactions_tableflip_weekly.yml b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
new file mode 100644
index 00000000000..fb32d9645c3
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_tableflip_weekly
+description: Count of WAU using the `/tableflip` quick action 
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+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/20210216181815_i_quickactions_tag_weekly.yml b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
new file mode 100644
index 00000000000..8ebf21a4d5f
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_tag_weekly
+description: Count of WAU using the `/tag` quick action 
+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/20210216181819_i_quickactions_target_branch_weekly.yml b/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
new file mode 100644
index 00000000000..fc3b92381c0
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_target_branch_weekly
+description: Count of WAU using the `/target_branch` quick action on Merge Requests
+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
\ No newline at end of file
diff --git a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
new file mode 100644
index 00000000000..32f4957e2be
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_title_weekly
+description: Count of WAU using the `/title` quick action 
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+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/20210216181826_i_quickactions_todo_weekly.yml b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
new file mode 100644
index 00000000000..30ccc93b33a
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_todo_weekly
+description: Count of WAU using the `/todo` quick action 
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+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/20210216181830_i_quickactions_unassign_specific_weekly.yml b/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
new file mode 100644
index 00000000000..2d5ea7669b1
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_unassign_specific_weekly
+description: Count of WAU using the `/unassign @user1` quick action on Merge Requests
+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/20210216181833_i_quickactions_unassign_all_weekly.yml b/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
new file mode 100644
index 00000000000..278a71ba4b7
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_unassign_all_weekly
+description: Count of WAU using the `/unassign` quick action on Merge Requests
+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
\ No newline at end of file
diff --git a/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
new file mode 100644
index 00000000000..ea248000bad
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_unassign_reviewer_weekly
+description: Count of WAU using the `/unassign_reviewer` or `/remove_reviewer` quick action on Merge Requests
+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/20210216181841_i_quickactions_unlabel_specific_weekly.yml b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
new file mode 100644
index 00000000000..ae787a56957
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_specific_weekly
+description: Count of WAU using the `/unlabel` or `/remove_label` quick action to remove one or more specific labels
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181457_g_project_management_issue_health_status_changed_monthly.yml b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
index c2c986ca5ef..f0e3d4599ac 100644
--- a/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml
+++ b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
@@ -1,16 +1,19 @@
 ---
-key_path: redis_hll_counters.issues_edit.g_project_management_issue_health_status_changed_monthly
-description: Count of MAU changing the health status on an issue
+key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_all_weekly
+description: Count of WAU using the `/unlabel` quick action to remove all labels
 product_section: dev
 product_stage: plan
 product_group: group::project management
 product_category: issue_tracking
 value_type: number
 status: data_available
-time_frame: 28d
+time_frame: 7d
 data_source: redis_hll
 distribution:
 - ce
+- ee 
 tier:
 - free
-skip_validation: true
+- premium 
+- ultimate
+
diff --git a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
new file mode 100644
index 00000000000..ae1b5364e99
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_unlock_weekly
+description: Count of WAU using the `/unlock` quick action
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181852_i_quickactions_unsubscribe_weekly.yml b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
new file mode 100644
index 00000000000..e0721034639
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_unsubscribe_weekly
+description: Count of WAU using the `/unsubscribe` quick action
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+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/20210216181859_i_quickactions_wip_weekly.yml b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
new file mode 100644
index 00000000000..6180cdda935
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_wip_weekly
+description: Count of WAU using the `/wip` quick action on Merge Requests
+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/20210216181903_i_quickactions_zoom_weekly.yml b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
new file mode 100644
index 00000000000..22cc7a3d2e9
--- /dev/null
+++ b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_zoom_weekly
+description: Count of WAU using the `/zoom` quick action on Issues 
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking 
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee 
+tier:
+- free
+- premium 
+- ultimate
\ No newline at end of file
diff --git a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
index f6f2bb9ab74..cc125283f2c 100644
--- a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
+++ b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml b/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml
deleted file mode 100644
index f88b6539ceb..00000000000
--- a/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-key_path: redis_hll_counters.testing.i_testing_metrics_report_artifact_uploaders_weekly
-description: Internal Tracking to count number of unit tests parsed for planning of
-  future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
-product_section: ops
-product_stage: verify
-product_group: group::testing
-product_category: code_testing
-value_type: number
-status: data_available
-time_frame: 7d
-data_source: redis_hll
-distribution:
-- ee
-- ce
-tier:
-- free
-- premium
-- ultimate
-skip_validation: true
diff --git a/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml b/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
new file mode 100644
index 00000000000..7443c3d599f
--- /dev/null
+++ b/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts_weekly.aggregated_metrics.product_analytics_test_metrics_union
+description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: number
+status: removed
+milestone_removed: '13.11'
+milestone: '13.7'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49886
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
new file mode 100644
index 00000000000..d4d6a713936
--- /dev/null
+++ b/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts_weekly.aggregated_metrics.product_analytics_test_metrics_intersection
+description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: number
+status: removed
+milestone_removed: '13.11'
+milestone: '13.7'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49886
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml b/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
index 6aa2fb0869b..210165bbaaa 100644
--- a/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
+++ b/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
@@ -6,7 +6,7 @@ product_stage: verify
 product_group: group::pipeline authoring
 product_category: pipeline_authoring
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54707
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
index 3be97a2741e..8d4623c2510 100644
--- a/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
index fb47deaba92..ef4eb268704 100644
--- a/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55046
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
index 91c88c00af8..7be92f4cb64 100644
--- a/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55046
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
index 8c32af239d3..fb173ceb63b 100644
--- a/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
index de86af98b29..4a4fd9ffd75 100644
--- a/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
index 6de7db3685f..13be2a26bfb 100644
--- a/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
index c93e680d9f2..b975aa627f1 100644
--- a/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
index d127c097baa..7e7c13e74ca 100644
--- a/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
index 71d5fe8497f..b4654a63e32 100644
--- a/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
index 0e2c06609c4..337281d2af2 100644
--- a/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
index 3fe42c1240a..562cde19419 100644
--- a/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::ecosystem
 product_category: integrations
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml b/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
index 80471ed836a..ae79de32461 100644
--- a/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
+++ b/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55069
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml b/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
index 2295fb75a48..057e209785d 100644
--- a/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55069
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
index 2f158edf0af..0cbd5000181 100644
--- a/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55484
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml b/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
index 14710eb040a..5f292bfec27 100644
--- a/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55484
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml b/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
index 334114dd64c..35da1f85c9a 100644
--- a/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55486
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml b/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
index a70d0b6204d..7dd45a43a11 100644
--- a/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55486
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
new file mode 100644
index 00000000000..c510d544426
--- /dev/null
+++ b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.secure.users_expanding_secure_security_report_weekly
+description: Count of expanding the security report widget
+product_section: sec
+product_stage: secure
+product_group: group::static analysis
+product_category: dependency_scanning
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
new file mode 100644
index 00000000000..5b714b49bd8
--- /dev/null
+++ b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.testing.users_expanding_testing_code_quality_report_weekly
+description: Count of expanding the code quality widget
+product_section: ops
+product_stage: verify
+product_group: group::testing
+product_category: code_quality
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
new file mode 100644
index 00000000000..b8fdf90bb41
--- /dev/null
+++ b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.testing.users_expanding_testing_accessibility_report_weekly
+description: Count of expanding the accessibility report widget
+product_section: ops
+product_stage: verify
+product_group: group::testing
+product_category: accessibility_testing
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
new file mode 100644
index 00000000000..f44347f5159
--- /dev/null
+++ b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.testing.i_testing_summary_widget_total_weekly
+description: Unique users that expand the test summary merge request widget by week
+product_section: ops
+product_stage: verify
+product_group: group::testing
+product_category: testing
+value_type: number
+status: implemented
+milestone: "13.11"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59316
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
index 7ef825975a2..2257a325aa6 100644
--- a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
+++ b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
@@ -7,7 +7,7 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
 data_source: database
 distribution:
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
index 2aad13de693..b716862c512 100644
--- a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
+++ b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
@@ -7,7 +7,7 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
 data_source: database
 distribution:
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
index f1330d775a8..36605f8cd92 100644
--- a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
+++ b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
@@ -9,7 +9,7 @@ product_category: container_network_security
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
 - ee
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175448_network_policy_drops.yml b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
index e76c53f7b95..d254fedced4 100644
--- a/config/metrics/counts_all/20210216175448_network_policy_drops.yml
+++ b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
@@ -9,7 +9,7 @@ product_category: container_network_security
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
 - ee
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
index 6fc4f6178bb..74d2c99c5aa 100644
--- a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
+++ b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
@@ -6,7 +6,7 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
 data_source: database
 distribution:
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
index 7f2e91c88eb..7fce44b02cd 100644
--- a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
+++ b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
@@ -6,7 +6,7 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
 data_source: database
 distribution:
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
index 5c028ab30e1..838837e223d 100644
--- a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
+++ b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
@@ -6,7 +6,7 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
 data_source: database
 distribution:
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
index e0c49c6b070..1e6ee0d40cb 100644
--- a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
+++ b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
@@ -6,7 +6,7 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
 data_source: database
 distribution:
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
index 2df821ee8ad..d8ab29b3ef5 100644
--- a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.web_ide_merge_requests
-description: Count of Merge Requests created from Web IDE
+description: Count of merge requests created from Web IDE
 product_section: dev
 product_stage: create
 product_group: group::editor
diff --git a/config/metrics/counts_all/20210216180922_duration_s.yml b/config/metrics/counts_all/20210216180922_duration_s.yml
deleted file mode 100644
index 2ddbd1f25e8..00000000000
--- a/config/metrics/counts_all/20210216180922_duration_s.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-key_path: topology.duration_s
-description: Time it took to collect topology data
-product_section: enablement
-product_stage: enablement
-product_group: group::memory
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source: prometheus
-distribution:
-- ce
-- ee
-tier:
-- free
-- premium
-- ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180924_failures.yml b/config/metrics/counts_all/20210216180924_failures.yml
deleted file mode 100644
index 0706ffc7e7f..00000000000
--- a/config/metrics/counts_all/20210216180924_failures.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-key_path: topology.failures
-description: Contains information about failed queries
-product_section: enablement
-product_stage: enablement
-product_group: group::memory
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source: prometheus
-distribution:
-- ce
-- ee
-tier:
-- free
-- premium
-- ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216181102_issues.yml b/config/metrics/counts_all/20210216181102_issues.yml
index 2898486642e..ca89db705f1 100644
--- a/config/metrics/counts_all/20210216181102_issues.yml
+++ b/config/metrics/counts_all/20210216181102_issues.yml
@@ -2,7 +2,7 @@
 key_path: counts.issues
 description: Count of Issues created
 product_section: dev
-product_stage:
+product_stage: plan
 product_group: group::plan
 product_category: issue_tracking
 value_type: number
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216181104_label_lists.yml b/config/metrics/counts_all/20210216181104_label_lists.yml
index e064fe310b5..e12bdcabe41 100644
--- a/config/metrics/counts_all/20210216181104_label_lists.yml
+++ b/config/metrics/counts_all/20210216181104_label_lists.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.label_lists
-description:
+description: Count of label lists created on Boards 
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: plan
+product_group: group::project management 
+product_category: boards 
 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/20210216181106_milestone_lists.yml b/config/metrics/counts_all/20210216181106_milestone_lists.yml
deleted file mode 100644
index 138ad791d5a..00000000000
--- a/config/metrics/counts_all/20210216181106_milestone_lists.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.milestone_lists
-description:
-product_section: dev
-product_stage:
-product_group: group::plan
-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/20210216181108_milestones.yml b/config/metrics/counts_all/20210216181108_milestones.yml
index d0be9293cfc..29e6bad41ee 100644
--- a/config/metrics/counts_all/20210216181108_milestones.yml
+++ b/config/metrics/counts_all/20210216181108_milestones.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.milestones
-description:
+description: Count of milestones created 
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: plan 
+product_group: group::project management
+product_category: issue_tracking 
 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/20210216181109_uploads.yml b/config/metrics/counts_all/20210216181109_uploads.yml
index 0035b499326..c72d51b4cb9 100644
--- a/config/metrics/counts_all/20210216181109_uploads.yml
+++ b/config/metrics/counts_all/20210216181109_uploads.yml
@@ -2,8 +2,8 @@
 key_path: counts.uploads
 description: Count of Uploads via Notes and Descriptions
 product_section: dev
-product_stage:
-product_group: group::plan
+product_stage: plan 
+product_group: group::project management 
 product_category: issue_tracking
 value_type: number
 status: data_available
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216181111_labels.yml b/config/metrics/counts_all/20210216181111_labels.yml
index cce534d49e7..328b0fcd991 100644
--- a/config/metrics/counts_all/20210216181111_labels.yml
+++ b/config/metrics/counts_all/20210216181111_labels.yml
@@ -2,8 +2,8 @@
 key_path: counts.labels
 description: Count of Labels
 product_section: dev
-product_stage:
-product_group: group::plan
+product_stage: plan 
+product_group: group::project management
 product_category: issue_tracking
 value_type: number
 status: data_available
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216181113_notes.yml b/config/metrics/counts_all/20210216181113_notes.yml
index b019e9b9023..0046fe630bb 100644
--- a/config/metrics/counts_all/20210216181113_notes.yml
+++ b/config/metrics/counts_all/20210216181113_notes.yml
@@ -2,8 +2,8 @@
 key_path: counts.notes
 description: Count of Notes across all objects that use them
 product_section: dev
-product_stage:
-product_group: group::plan
+product_stage: plan 
+product_group: group::project management
 product_category: issue_tracking
 value_type: number
 status: data_available
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216181115_issues.yml b/config/metrics/counts_all/20210216181115_issues.yml
index 2f751d47d2c..0c4db95b275 100644
--- a/config/metrics/counts_all/20210216181115_issues.yml
+++ b/config/metrics/counts_all/20210216181115_issues.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage.plan.issues
-description:
+description: Count of users creating Issues
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
 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/20210216181117_notes.yml b/config/metrics/counts_all/20210216181117_notes.yml
index a948750b747..93e699fda60 100644
--- a/config/metrics/counts_all/20210216181117_notes.yml
+++ b/config/metrics/counts_all/20210216181117_notes.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage.plan.notes
-description:
+description: Count of users creating Notes on Issues
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
 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/20210216181119_projects.yml b/config/metrics/counts_all/20210216181119_projects.yml
index 807d2851393..6cabd4eaf8b 100644
--- a/config/metrics/counts_all/20210216181119_projects.yml
+++ b/config/metrics/counts_all/20210216181119_projects.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage.plan.projects
-description:
+description: Count of users creating projects
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: plan
+product_group: group::project management
+product_category: projects
 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/20210216181121_todos.yml b/config/metrics/counts_all/20210216181121_todos.yml
index 2869e59033e..679a8eb3394 100644
--- a/config/metrics/counts_all/20210216181121_todos.yml
+++ b/config/metrics/counts_all/20210216181121_todos.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage.plan.todos
-description:
+description: Count of users todos created
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
 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/20210216181135_label_lists.yml b/config/metrics/counts_all/20210216181135_label_lists.yml
index 4cd9374cdbb..8385157a13f 100644
--- a/config/metrics/counts_all/20210216181135_label_lists.yml
+++ b/config/metrics/counts_all/20210216181135_label_lists.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage.plan.label_lists
-description:
+description: Count of users creating label lists on Boards
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: plan
+product_group: group::project management
+product_category: boards
 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/20210216181137_milestone_lists.yml b/config/metrics/counts_all/20210216181137_milestone_lists.yml
deleted file mode 100644
index d0741ebd0b3..00000000000
--- a/config/metrics/counts_all/20210216181137_milestone_lists.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.plan.milestone_lists
-description:
-product_section: dev
-product_stage:
-product_group: group::plan
-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/20210216181205_confidential_epics.yml b/config/metrics/counts_all/20210216181205_confidential_epics.yml
deleted file mode 100644
index f2941af6bd2..00000000000
--- a/config/metrics/counts_all/20210216181205_confidential_epics.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.confidential_epics
-description:
-product_section: dev
-product_stage: plan
-product_group: group::portfolio management
-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/20210216181206_epics.yml b/config/metrics/counts_all/20210216181206_epics.yml
deleted file mode 100644
index 97452db6f85..00000000000
--- a/config/metrics/counts_all/20210216181206_epics.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.epics
-description:
-product_section: dev
-product_stage: plan
-product_group: group::portfolio management
-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/20210216181210_issues_with_health_status.yml b/config/metrics/counts_all/20210216181210_issues_with_health_status.yml
deleted file mode 100644
index 1df3a5d1a38..00000000000
--- a/config/metrics/counts_all/20210216181210_issues_with_health_status.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.issues_with_health_status
-description:
-product_section: dev
-product_stage: plan
-product_group: group::portfolio management
-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/20210216181252_boards.yml b/config/metrics/counts_all/20210216181252_boards.yml
index 9316320129f..7552c7289c7 100644
--- a/config/metrics/counts_all/20210216181252_boards.yml
+++ b/config/metrics/counts_all/20210216181252_boards.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.boards
-description:
+description: Count of total Boards created 
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category:
+product_category: boards 
 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/20210216181254_projects.yml b/config/metrics/counts_all/20210216181254_projects.yml
index b2cd3039fcb..3e15f602f06 100644
--- a/config/metrics/counts_all/20210216181254_projects.yml
+++ b/config/metrics/counts_all/20210216181254_projects.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.projects
-description: Count of Projects
+description: Count of Projects created
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -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/20210216181256_todos.yml b/config/metrics/counts_all/20210216181256_todos.yml
index 7ffddb73f38..bf3f34500c5 100644
--- a/config/metrics/counts_all/20210216181256_todos.yml
+++ b/config/metrics/counts_all/20210216181256_todos.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.todos
-description: Count of ToDos
+description: Count of todos created
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
index b51a38a4f3c..c18888edb23 100644
--- a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
+++ b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
@@ -1,9 +1,9 @@
 ---
 key_path: counts.jira_imports_total_imported_count
-description: Count of Issues imported from Jira
+description: Count of Jira imports completed
 product_section: dev
-product_stage: plan
-product_group: group::project management
+product_stage: create
+product_group: group::ecosystem
 product_category: jira_importer
 value_type: number
 status: data_available
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
index c1f8e312021..321273f800e 100644
--- a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
+++ b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
@@ -2,8 +2,8 @@
 key_path: counts.jira_imports_projects_count
 description: Count of Projects that imported Issues from Jira
 product_section: dev
-product_stage: plan
-product_group: group::project management
+product_stage: create
+product_group: group::ecosystem
 product_category: jira_importer
 value_type: number
 status: data_available
@@ -15,5 +15,4 @@ distribution:
 tier:
 - free
 - premium
-- ultimate
-skip_validation: true
+- ultimate
\ No newline at end of file
diff --git a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
index 9ab377e5e04..b8e031dd744 100644
--- a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
+++ b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
@@ -1,9 +1,9 @@
 ---
 key_path: counts.jira_imports_total_imported_issues_count
-description: Count of Jira imports run
+description: Count of total issues imported via the Jira Importer
 product_section: dev
-product_stage: plan
-product_group: group::project management
+product_stage: create
+product_group: group::ecosystem
 product_category: jira_importer
 value_type: number
 status: data_available
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182203_user_preferences_group_overview_details.yml b/config/metrics/counts_all/20210216182203_user_preferences_group_overview_details.yml
deleted file mode 100644
index 5f06bcf1607..00000000000
--- a/config/metrics/counts_all/20210216182203_user_preferences_group_overview_details.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-key_path: counts.user_preferences_group_overview_details
-description: Count of users who set personal preference to see Details on Group overview
-  page
-product_section: sec
-product_stage: secure
-product_group: group::threat insights
-product_category: vulnerability_management
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-- ee
-tier:
-- ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182205_user_preferences_group_overview_security_dashboard.yml b/config/metrics/counts_all/20210216182205_user_preferences_group_overview_security_dashboard.yml
deleted file mode 100644
index 688720eebb9..00000000000
--- a/config/metrics/counts_all/20210216182205_user_preferences_group_overview_security_dashboard.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-key_path: counts.user_preferences_group_overview_security_dashboard
-description: Count of users who set personal preference to see Security Dashboard
-  on Group overview page
-product_section: sec
-product_stage: secure
-product_group: group::threat insights
-product_category: vulnerability_management
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-- ee
-tier:
-- ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182207_user_preferences_group_overview_security_dashboard.yml b/config/metrics/counts_all/20210216182207_user_preferences_group_overview_security_dashboard.yml
deleted file mode 100644
index 7337c457249..00000000000
--- a/config/metrics/counts_all/20210216182207_user_preferences_group_overview_security_dashboard.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-key_path: usage_activity_by_stage.secure.user_preferences_group_overview_security_dashboard
-description: Users who set personal preference to see Details on Group overview page
-product_section: sec
-product_stage: secure
-product_group: group::threat insights
-product_category: vulnerability_management
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-- ee
-tier:
-- ultimate
-skip_validation: true
diff --git a/config/metrics/license/20210204124938_recording_ce_finished_at.yml b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
index 8afcd1bab02..b1fd0589e4a 100644
--- a/config/metrics/license/20210204124938_recording_ce_finished_at.yml
+++ b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
@@ -8,10 +8,11 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: ruby
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/license/20210216175602_installation_type.yml b/config/metrics/license/20210216175602_installation_type.yml
index 577d0d502b3..ae5f26ff0a2 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:
+data_source: ruby
 distribution:
 - ce
 - ee
@@ -16,4 +16,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
+
diff --git a/config/metrics/objects_schemas/topology_schema.json b/config/metrics/objects_schemas/topology_schema.json
new file mode 100644
index 00000000000..c422966c5c5
--- /dev/null
+++ b/config/metrics/objects_schemas/topology_schema.json
@@ -0,0 +1,43 @@
+{
+  "type": "object",
+  "required": ["duration", "failures"],
+  "properties": {
+    "duration": { "type": "number", "description": "The time it took to collect topology data" },
+    "failures": { "type": "array", "description": "The information about failed queries" },
+    "application_requests_per_hour": { "type": "number", "description": "The number of requests to the web application per hour" },
+    "nodes": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "node_cpus":               { "type": "number", "description": "The number of CPU cores of this node" },
+          "node_cpu_utilization":    { "type": "number", "description": "The CPU utilization ratio of this node" },
+          "node_memory_total_bytes": { "type": "number", "description": "The total available memory of this node" },
+          "node_memory_utilization": { "type": "number", "description": "The memory utilization ratio of this node" },
+          "node_services": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "name":               { "type": "string", "description": "The name of the GitLab service running on this node" },
+                "server":             { "type": "string", "description": "The type of web server used (Unicorn or Puma)" },
+                "process_count":      { "type": "number", "description": "The number of processes running for this service" },
+                "process_memory_rss": { "type": "number", "description": "The average Resident Set Size of a service process" },
+                "process_memory_uss": { "type": "number", "description": "The average Unique Set Size of a service process" },
+                "process_memory_pss": { "type": "number", "description": "The average Proportional Set Size of a service proces" }
+              }
+            }
+          },
+          "node_uname_info": {
+            "type": "object",
+            "properties": {
+              "machine": { "type": "string", "description": "The machine hardware name of this node" },
+              "release": { "type": "string", "description": "The operating system release of this node" },
+              "sysname": { "type": "string", "description": "The operating system name of this node" }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/config/metrics/schema.json b/config/metrics/schema.json
index cc1eafcf0ba..4c10aca7061 100644
--- a/config/metrics/schema.json
+++ b/config/metrics/schema.json
@@ -5,6 +5,10 @@
     "key_path": {
       "type": "string"
     },
+    "name": {
+      "type": ["string", "null"],
+      "pattern": "^([a-z]+_)*[a-z]+$"
+    },
     "description": {
       "type": "string"
     },
@@ -26,7 +30,7 @@
     },
     "status": {
       "type": ["string"],
-      "enum": ["data_available", "planned", "in_progress", "implemented", "not_used", "deprecated"]
+      "enum": ["data_available", "implemented", "not_used", "deprecated", "removed"]
     },
     "milestone": {
       "type": ["string", "null"],
diff --git a/config/metrics/counts_all/20210216174829_smtp_server.yml b/config/metrics/settings/20210216174829_smtp_server.yml
index b60db7728c4..afee13f5534 100644
--- a/config/metrics/counts_all/20210216174829_smtp_server.yml
+++ b/config/metrics/settings/20210216174829_smtp_server.yml
@@ -2,13 +2,13 @@
 key_path: mail.smtp_server
 description: The value of the SMTP server that is used
 product_section: growth
-product_stage:
-product_group: group::acquisition
-product_category:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: ruby
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
index 6bb5795c971..ee3741581b4 100644
--- a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -6,9 +6,9 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: boolean
-status: data_available
+status: deprecated
 time_frame: none
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ 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 1828d18b794..37b12a982bb 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:
+data_source: ruby
 distribution:
 - ce
 - ee
@@ -16,4 +16,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
+
diff --git a/config/metrics/license/20210216175609_version.yml b/config/metrics/settings/20210216175609_version.yml
index fd707691e6d..378ae0e2ee4 100644
--- a/config/metrics/license/20210216175609_version.yml
+++ b/config/metrics/settings/20210216175609_version.yml
@@ -8,9 +8,12 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+
diff --git a/config/metrics/settings/20210225045628_operating_system.yml b/config/metrics/settings/20210225045628_operating_system.yml
index e88b8f8c827..0d60bc309b4 100644
--- a/config/metrics/settings/20210225045628_operating_system.yml
+++ b/config/metrics/settings/20210225045628_operating_system.yml
@@ -6,7 +6,7 @@ product_stage: enablement
 product_group: group::distribution
 product_category: collection
 value_type: string
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54778
 time_frame: none
diff --git a/config/metrics/settings/20210323120839_topology.yml b/config/metrics/settings/20210323120839_topology.yml
new file mode 100644
index 00000000000..9cc32b75790
--- /dev/null
+++ b/config/metrics/settings/20210323120839_topology.yml
@@ -0,0 +1,21 @@
+---
+key_path: topology
+description: Topology data
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category:
+value_type: object
+status: data_available
+milestone: "13.11"
+introduced_by_url: https://gitlab.com/groups/gitlab-org/-/epics/3209
+time_frame: none
+data_source: prometheus
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+object_json_schema: 'config/metrics/objects_schemas/topology_schema.json'
diff --git a/config/redis.cache.yml.example b/config/redis.cache.yml.example
index fb92c205ce1..44d9f7e8632 100644
--- a/config/redis.cache.yml.example
+++ b/config/redis.cache.yml.example
@@ -1,5 +1,5 @@
-# If you change this file in a Merge Request, please also create
-# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+# If you change this file in a merge request, please also create
+# a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
 #
 development:
   url: redis://localhost:6379/10
diff --git a/config/redis.queues.yml.example b/config/redis.queues.yml.example
index dd6c10e0e06..4194b44cb88 100644
--- a/config/redis.queues.yml.example
+++ b/config/redis.queues.yml.example
@@ -1,5 +1,5 @@
-# If you change this file in a Merge Request, please also create
-# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+# If you change this file in a merge request, please also create
+# a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
 #
 development:
   url: redis://localhost:6379/11
diff --git a/config/redis.shared_state.yml.example b/config/redis.shared_state.yml.example
index 98f6f330bc7..b3e0c7a8fa9 100644
--- a/config/redis.shared_state.yml.example
+++ b/config/redis.shared_state.yml.example
@@ -1,5 +1,5 @@
-# If you change this file in a Merge Request, please also create
-# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+# If you change this file in a merge request, please also create
+# a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
 #
 development:
   url: redis://localhost:6379/12
diff --git a/config/resque.yml.example b/config/resque.yml.example
index 0f629a5229c..656cd57a739 100644
--- a/config/resque.yml.example
+++ b/config/resque.yml.example
@@ -1,5 +1,5 @@
-# If you change this file in a Merge Request, please also create
-# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+# If you change this file in a merge request, please also create
+# a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
 #
 development:
   url: redis://localhost:6379
diff --git a/config/routes.rb b/config/routes.rb
index 38030a24cb5..1258675df86 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -179,6 +179,7 @@ Rails.application.routes.draw do
         get :db_spin
         get :sleep
         get :kill
+        get :quit
         post :gc
       end
     end
@@ -220,6 +221,12 @@ Rails.application.routes.draw do
         post :authorize_aws_role
       end
 
+      resource :integration, controller: 'clusters/integrations', only: [] do
+        collection do
+          post :create_or_update
+        end
+      end
+
       member do
         Gitlab.ee do
           get :metrics, format: :json
@@ -284,6 +291,7 @@ Rails.application.routes.draw do
 
   draw :git_http
   draw :api
+  draw :customers_dot
   draw :sidekiq
   draw :help
   draw :google_api
diff --git a/config/routes/customers_dot.rb b/config/routes/customers_dot.rb
new file mode 100644
index 00000000000..d6afb54cae8
--- /dev/null
+++ b/config/routes/customers_dot.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+scope '-' do
+  namespace :customers_dot do
+    post 'proxy/graphql' => 'proxy#graphql'
+  end
+end
diff --git a/config/routes/group.rb b/config/routes/group.rb
index e1ae860f6ec..126680a0b44 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -50,6 +50,8 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
         end
       end
 
+      resources :applications
+
       resources :packages_and_registries, only: [:index]
     end
 
diff --git a/config/routes/pipelines.rb b/config/routes/pipelines.rb
index 0fc308b5e65..1a74abdeaa1 100644
--- a/config/routes/pipelines.rb
+++ b/config/routes/pipelines.rb
@@ -12,7 +12,6 @@ resources :pipelines, only: [:index, :new, :create, :show, :destroy] do
 
   member do
     get :stage
-    get :stage_ajax
     post :cancel
     post :retry
     get :builds
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 21dfe173715..09b212bc1a2 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -50,6 +50,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
+        resources :infrastructure_registry, only: [:index], module: :packages
+
         resources :jobs, only: [:index, :show], constraints: { id: /\d+/ } do
           collection do
             resources :artifacts, only: [] do
@@ -397,6 +399,18 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           to: 'web_ide_schemas#show',
           format: false,
           as: :schema
+
+        resources :hooks, only: [:index, :create, :edit, :update, :destroy], constraints: { id: /\d+/ } do
+          member do
+            post :test
+          end
+
+          resources :hook_logs, only: [:show] do
+            member do
+              post :retry
+            end
+          end
+        end
       end
       # End of the /-/ scope.
 
@@ -460,18 +474,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
 
       draw :legacy_builds
 
-      resources :hooks, only: [:index, :create, :edit, :update, :destroy], constraints: { id: /\d+/ } do # rubocop: disable Cop/PutProjectRoutesUnderScope
-        member do
-          post :test # rubocop:todo Cop/PutProjectRoutesUnderScope
-        end
-
-        resources :hook_logs, only: [:show] do # rubocop: disable Cop/PutProjectRoutesUnderScope
-          member do
-            post :retry # rubocop:todo Cop/PutProjectRoutesUnderScope
-          end
-        end
-      end
-
       resources :container_registry, only: [:index, :destroy, :show], # rubocop: disable Cop/PutProjectRoutesUnderScope
                                      controller: 'registry/repositories'
 
@@ -553,7 +555,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
       # Deprecated unscoped routing.
       scope as: 'deprecated' do
         # Issue https://gitlab.com/gitlab-org/gitlab/issues/118849
-        draw :pipelines
         draw :repository
 
         # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/29572
@@ -571,12 +572,13 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
       # Legacy routes.
       # Introduced in 12.0.
       # Should be removed with https://gitlab.com/gitlab-org/gitlab/issues/28848.
-      Gitlab::Routing.redirect_legacy_paths(self, :mirror, :tags,
+      Gitlab::Routing.redirect_legacy_paths(self, :mirror, :tags, :hooks,
                                             :cycle_analytics, :mattermost, :variables, :triggers,
                                             :environments, :protected_environments, :error_tracking, :alert_management,
                                             :tracing,
                                             :serverless, :clusters, :audit_events, :wikis, :merge_requests,
-                                            :vulnerability_feedback, :security, :dependencies, :issues)
+                                            :vulnerability_feedback, :security, :dependencies, :issues,
+                                            :pipelines, :pipeline_schedules)
     end
 
     # rubocop: disable Cop/PutProjectRoutesUnderScope
diff --git a/config/routes/repository.rb b/config/routes/repository.rb
index 61a407d5a35..58de3d29bb0 100644
--- a/config/routes/repository.rb
+++ b/config/routes/repository.rb
@@ -2,15 +2,7 @@
 
 # All routing related to repository browsing
 
-resource :repository, only: [:create] do
-  member do
-    # deprecated since GitLab 9.5
-    get 'archive', constraints: { format: Gitlab::PathRegex.archive_formats_regex }, as: 'archive_alternative', defaults: { append_sha: true }
-
-    # deprecated since GitLab 10.7
-    get ':id/archive', constraints: { format: Gitlab::PathRegex.archive_formats_regex, id: /.+/ }, action: 'archive', as: 'archive_deprecated', defaults: { append_sha: true }
-  end
-end
+resource :repository, only: [:create]
 
 resources :commit, only: [:show], constraints: { id: /\h{7,40}/ } do
   member do
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 3f6d919f5e9..c0aab89fd46 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -36,6 +36,8 @@
   - 1
 - - analytics_usage_trends_counter_job
   - 1
+- - approval_rules_external_approval_rule_payload
+  - 1
 - - approve_blocked_pending_approval_users
   - 1
 - - authorized_keys
@@ -54,6 +56,8 @@
   - 1
 - - bulk_imports_entity
   - 1
+- - bulk_imports_pipeline
+  - 1
 - - chaos
   - 2
 - - chat_notification
@@ -208,8 +212,16 @@
   - 1
 - - merge_request_reset_approvals
   - 1
+- - merge_requests_assignees_change
+  - 1
 - - merge_requests_delete_source_branch
   - 1
+- - merge_requests_handle_assignees_change
+  - 1
+- - merge_requests_resolve_todos
+  - 1
+- - merge_requests_sync_code_owner_approval_rules
+  - 1
 - - metrics_dashboard_prune_old_annotations
   - 1
 - - metrics_dashboard_sync_dashboards
@@ -294,6 +306,8 @@
   - 1
 - - projects_git_garbage_collect
   - 1
+- - projects_post_creation
+  - 1
 - - projects_schedule_bulk_repository_shard_moves
   - 1
 - - projects_update_repository_storage
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example
index 77e440eddde..c930e2ff761 100644
--- a/config/unicorn.rb.example
+++ b/config/unicorn.rb.example
@@ -8,8 +8,8 @@
 # See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
 # documentation.
 
-# Note: If you change this file in a Merge Request, please also create a
-# Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+# Note: If you change this file in a merge request, please also create a
+# merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
 
 # Relative URL support
 # WARNING: We recommend using an FQDN to host GitLab in a root path instead
@@ -41,7 +41,7 @@ working_directory "/home/git/gitlab" # available in 0.94.0+
 listen "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 1024
 listen "127.0.0.1:8080", :tcp_nopush => true
 
-# nuke workers after 30 seconds instead of 60 seconds (the default)
+# destroy workers after 30 seconds instead of 60 seconds (the default)
 #
 # NOTICE: git push over http depends on this value.
 # If you want to be able to push huge amount of data to git repository over http
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 39add7def22..94aa190b77a 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -121,6 +121,7 @@ const alias = {
   images: path.join(ROOT_PATH, 'app/assets/images'),
   vendor: path.join(ROOT_PATH, 'vendor/assets/javascripts'),
   vue$: 'vue/dist/vue.esm.js',
+  jquery$: 'jquery/dist/jquery.slim.js',
   spec: path.join(ROOT_PATH, 'spec/javascripts'),
   jest: path.join(ROOT_PATH, 'spec/frontend'),
   shared_queries: path.join(ROOT_PATH, 'app/graphql/queries'),
@@ -306,6 +307,14 @@ module.exports = {
           chunks: 'initial',
           minChunks: autoEntriesCount * 0.9,
         }),
+        tiptap: {
+          priority: 17,
+          name: 'tiptap',
+          chunks: 'all',
+          test: /[\\/]node_modules[\\/](tiptap|prosemirror)-?\w*[\\/]/,
+          minChunks: 2,
+          reuseExistingChunk: true,
+        },
         graphql: {
           priority: 16,
           name: 'graphql',
diff --git a/config/webpack.vendor.config.js b/config/webpack.vendor.config.js
index 7e5365987ee..6d337c1d82b 100644
--- a/config/webpack.vendor.config.js
+++ b/config/webpack.vendor.config.js
@@ -13,6 +13,9 @@ module.exports = {
   mode: 'development',
   resolve: {
     extensions: ['.js'],
+    alias: {
+      jquery$: 'jquery/dist/jquery.slim.js',
+    },
   },
 
   // ensure output is not generated when errors are encountered
@@ -22,7 +25,7 @@ module.exports = {
 
   entry: {
     vendor: [
-      'jquery',
+      'jquery/dist/jquery.slim.js',
       'pdfjs-dist/build/pdf',
       'pdfjs-dist/build/pdf.worker.min',
       'sql.js',