Add latest changes from gitlab-org/gitlab@master

38 files changed, 160 insertions, 308 deletions

diff --git a/config/metrics/counts_28d/20210216182034_deploy_keys.yml b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
index 80f50c7d1a5..0f5a6b3c03d 100644
--- a/config/metrics/counts_28d/20210216182034_deploy_keys.yml
+++ b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.deploy_keys
-description:
+description: Count of users creating deploy keys in last 28 days.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182036_keys.yml b/config/metrics/counts_28d/20210216182036_keys.yml
index d1299065115..eb82cc1f0e6 100644
--- a/config/metrics/counts_28d/20210216182036_keys.yml
+++ b/config/metrics/counts_28d/20210216182036_keys.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.keys
-description:
+description: Count of users creating regular keys in last 28 days.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
index 6b42f18e664..bb64dcb32ca 100644
--- a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
+++ b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.remote_mirrors
-description:
+description: Count of users creating projects with remote mirrors. Includes both push and pull mirrors.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
index c75efaf0a80..f1f00fe59e3 100644
--- a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
+++ b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_project_repo
-description:
+description: Count of monthly active users who have performed any Git operation (read/write/push)
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
index 25405624b03..de369a47ffb 100644
--- a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
+++ b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_git_write
-description: Aggregated value for wiki, design and project repo actions
+description: Aggregated value for wiki, design, and project repo Git write actions
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml b/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
deleted file mode 100644
index dfacce63f05..00000000000
--- a/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.projects_with_sectional_code_owner_rules
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml b/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
deleted file mode 100644
index d87b910d239..00000000000
--- a/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.projects_with_repositories_enabled
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182051_protected_branches.yml b/config/metrics/counts_28d/20210216182051_protected_branches.yml
index 81d23653307..83c923c173e 100644
--- a/config/metrics/counts_28d/20210216182051_protected_branches.yml
+++ b/config/metrics/counts_28d/20210216182051_protected_branches.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.protected_branches
-description:
+description: Count of users creating projects with repositories making use of at least one protected branch in last 28 days.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
index af59d1a1235..527cc42df22 100644
--- a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.source_code.wiki_action_monthly
-description:
+description: Count of unique actions done on a wiki (create, edit, delete)
 product_section: dev
 product_stage: create
 product_group: group::source code
-product_category:
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
index 8feb369d0fa..971e3defe25 100644
--- a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.source_code.design_action_monthly
-description:
+description: Count of total design actions (upload, delete, comment, reply)
 product_section: dev
 product_stage: create
 product_group: group::source code
-product_category:
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
index 6047e6b6059..d60ec7f438b 100644
--- a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.source_code.project_action_monthly
-description:
+description: Count of unique actions done on projects and related resources (create, edit, delete, comment)
 product_section: dev
 product_stage: create
 product_group: group::source code
-product_category:
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml b/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
deleted file mode 100644
index e3980a944c6..00000000000
--- a/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.total_number_of_path_locks
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml b/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
deleted file mode 100644
index 3808a2f2dcb..00000000000
--- a/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.total_number_of_locked_files
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
index eb0ffa26d2a..e0c301b5c03 100644
--- a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.source_code.git_write_action_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique Git write actions
+product_section: dev
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
new file mode 100644
index 00000000000..e887858fe96
--- /dev/null
+++ b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.source_code.wiki_action_weekly
+description: Count of unique actions done on a wiki (create, edit, delete)
+product_section: dev
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
new file mode 100644
index 00000000000..37744671757
--- /dev/null
+++ b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.source_code.design_action_weekly
+description: Count of total design actions (upload, delete, comment, reply)
+product_section: dev
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
new file mode 100644
index 00000000000..6f6dc87783a
--- /dev/null
+++ b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.source_code.project_action_weekly
+description: Count of unique actions done on projects and related resources (create, edit, delete, comment)
+product_section: dev
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
index c47fa49fe06..e14c0a39399 100644
--- a/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml
+++ b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
@@ -1,16 +1,18 @@
 ---
-key_path: usage_activity_by_stage_monthly.create.projects_enforcing_code_owner_approval
-description:
+key_path: redis_hll_counters.source_code.git_write_action_weekly
+description: Count of unique Git write actions
 product_section: dev
 product_stage: create
 product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
-time_frame: 28d
-data_source:
+time_frame: 7d
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml b/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
deleted file mode 100644
index 926ed501639..00000000000
--- a/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.projects_with_repositories_enabled
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182001_protected_branches.yml b/config/metrics/counts_all/20210216182001_protected_branches.yml
deleted file mode 100644
index cbd378bd93a..00000000000
--- a/config/metrics/counts_all/20210216182001_protected_branches.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.protected_branches
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182002_remote_mirrors.yml b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
index f344a7c1640..c784bc57a00 100644
--- a/config/metrics/counts_all/20210216182002_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.remote_mirrors
-description:
+description: Count of total remote mirrors. Includes both push and pull mirrors
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -11,6 +11,8 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index 2e427d14acd..b7d7c08196a 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.commit_comment
-description:
+description: Count of total unique commit comments. Does not include MR diff comments
 product_section: dev
 product_stage: create
 product_group: group::source code
-product_category: code_review
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182006_source_code_pushes.yml b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
index 824761adaee..980314f6829 100644
--- a/config/metrics/counts_all/20210216182006_source_code_pushes.yml
+++ b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.source_code_pushes
-description:
+description: Count of total Git push operations
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182008_template_repositories.yml b/config/metrics/counts_all/20210216182008_template_repositories.yml
deleted file mode 100644
index 888f5d96ab6..00000000000
--- a/config/metrics/counts_all/20210216182008_template_repositories.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.template_repositories
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182010_deploy_keys.yml b/config/metrics/counts_all/20210216182010_deploy_keys.yml
index 2ddc48c2e0a..c7af2e13af2 100644
--- a/config/metrics/counts_all/20210216182010_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216182010_deploy_keys.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage.create.deploy_keys
-description:
+description: Count of users creating deploy keys.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182012_keys.yml b/config/metrics/counts_all/20210216182012_keys.yml
index 1872abc6776..449b56b6994 100644
--- a/config/metrics/counts_all/20210216182012_keys.yml
+++ b/config/metrics/counts_all/20210216182012_keys.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage.create.keys
-description:
+description: Count of users creating regular keys.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
index 62883077ad5..7ddcdde577c 100644
--- a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage.create.projects_with_disable_overriding_approvers_per_merge_request
-description:
+description: Total count of projects that do not allow overriding approvers on discrete merge requests
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,10 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
index 8518e3700bb..78ba2fed801 100644
--- a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage.create.projects_without_disable_overriding_approvers_per_merge_request
-description:
+description: Count of total projects that do not disable overriding approvers per discrete merge request
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,10 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182017_remote_mirrors.yml b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
index f9edec7260b..e3b25e3bd37 100644
--- a/config/metrics/counts_all/20210216182017_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage.create.remote_mirrors
-description:
+description: Count of users creating projects with remote mirrors.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml b/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
deleted file mode 100644
index 3ccbc99a4f1..00000000000
--- a/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.projects_enforcing_code_owner_approval
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml b/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml
deleted file mode 100644
index fcba0993477..00000000000
--- a/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.projects_with_sectional_code_owner_rules
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml b/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml
deleted file mode 100644
index a850295aea6..00000000000
--- a/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.projects_with_repositories_enabled
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182025_protected_branches.yml b/config/metrics/counts_all/20210216182025_protected_branches.yml
deleted file mode 100644
index f914c5dae6c..00000000000
--- a/config/metrics/counts_all/20210216182025_protected_branches.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.protected_branches
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml b/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml
deleted file mode 100644
index 9ce0b935888..00000000000
--- a/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.total_number_of_path_locks
-description: The total number of default branch locks done through the GitLab UI
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml b/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml
deleted file mode 100644
index 136472a59e4..00000000000
--- a/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.total_number_of_locked_files
-description: The total number of exclusive file locks (through the CLI)
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
index 66f616f16ee..cae090955c1 100644
--- a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
+++ b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.protected_branches_except_default
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of branches that have been protected and are not the default branch
+product_section: dev
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216183344_users_using_path_locks.yml b/config/metrics/counts_all/20210216183344_users_using_path_locks.yml
deleted file mode 100644
index f75db6ede2e..00000000000
--- a/config/metrics/counts_all/20210216183344_users_using_path_locks.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.users_using_path_locks
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml b/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml
deleted file mode 100644
index b232c6bbb41..00000000000
--- a/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.create.users_using_lfs_locks
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true