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

129 files changed, 907 insertions, 750 deletions

diff --git a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
index d589814b7af..c5a0a2eebcd 100644
--- a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
@@ -1,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.analytics_unique_visits_for_any_target_monthly
-description: Visits to any of the pages listed above per month
+description: Unique visitors to any analytics feature by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml b/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
deleted file mode 100644
index ea3094527db..00000000000
--- a/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.g_analytics_contribution_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml b/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
deleted file mode 100644
index cb792aae308..00000000000
--- a/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.g_analytics_insights_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml b/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
deleted file mode 100644
index 9fc7894d399..00000000000
--- a/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.g_analytics_issues_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml b/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
deleted file mode 100644
index 2ae3c3626d1..00000000000
--- a/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.g_analytics_productivity_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml b/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
deleted file mode 100644
index 86d84193265..00000000000
--- a/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.g_analytics_valuestream_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
index ba5c4d27d25..72a1f5a2faa 100644
--- a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
@@ -1,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.p_analytics_pipelines_monthly
-description:
+description: Unique visitors to /groups/:group/-/analytics/ci_cd by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml b/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
deleted file mode 100644
index e4c15360b52..00000000000
--- a/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.p_analytics_code_reviews_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
index da07cbee741..7bd0a5ae025 100644
--- a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
+++ b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
@@ -1,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.p_analytics_valuestream_monthly
-description:
+description: Unique visitors to /:group/:project/-/value_stream_analytics by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml b/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
deleted file mode 100644
index afe6c79e885..00000000000
--- a/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.p_analytics_insights_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml b/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
deleted file mode 100644
index 4ee8afd234b..00000000000
--- a/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.p_analytics_issues_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml b/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
deleted file mode 100644
index c41b84dbcd0..00000000000
--- a/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.p_analytics_repo_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
index 843d3717ba7..dc0d7f35622 100644
--- a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
+++ b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
@@ -1,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.i_analytics_cohorts_monthly
 description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
+product_section: fulfillment
+product_stage: fulfillment
+product_group: group::utilization
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
index 77b6068fb8d..ae43df148e5 100644
--- a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
+++ b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
@@ -1,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.i_analytics_dev_ops_score_monthly
-description:
+description: Unique visitors to /admin/dev_ops_report by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
index d7af387f862..c0fd0561ee4 100644
--- a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
@@ -3,14 +3,14 @@ key_path: redis_hll_counters.analytics.g_analytics_merge_request_monthly
 description:
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
-status: data_available
+status: removed
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
+skip_validation: true
\ No newline at end of file
diff --git a/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml b/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
deleted file mode 100644
index f3f7da5ee38..00000000000
--- a/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.p_analytics_merge_request_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
index d7071bf4a79..d9011ddf00b 100644
--- a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
+++ b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
@@ -1,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.i_analytics_instance_statistics_monthly
-description:
+description: Unique visitors to /admin/usage_trends by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
index d173a922f5d..3ce4cbc6e95 100644
--- a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
@@ -1,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.analytics_total_unique_counts_monthly
-description:
+description: The number of unique users who visited any analytics feature by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216175055_merge_requests.yml b/config/metrics/counts_28d/20210216175055_merge_requests.yml
index 048ea4fd917..bb1f64177a1 100644
--- a/config/metrics/counts_28d/20210216175055_merge_requests.yml
+++ b/config/metrics/counts_28d/20210216175055_merge_requests.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.merge_requests
-description:
+description: Count of the number of users creating merge requests
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -8,9 +8,11 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
index 7e9186a3a82..2db67a4028c 100644
--- a/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -1,17 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.projects_with_disable_overriding_approvers_per_merge_request
-description:
+description: Count of the number of projects with setting to disable overriding approvers per merge request
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
index 56107e921f2..152c248802a 100644
--- a/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -1,17 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.projects_without_disable_overriding_approvers_per_merge_request
-description:
+description: Count of the number of projects without setting to disable overriding approvers per merge request
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
index 563a56c2a0f..3df6f0f080a 100644
--- a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
+++ b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.merge_requests_users
-description:
+description: Monthly count of the number of merge request users
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -8,9 +8,11 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175109_suggestions.yml b/config/metrics/counts_28d/20210216175109_suggestions.yml
index 74e388fd07d..b3f019c59bc 100644
--- a/config/metrics/counts_28d/20210216175109_suggestions.yml
+++ b/config/metrics/counts_28d/20210216175109_suggestions.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.suggestions
-description:
+description: Count of unique users per month who create suggestions in merge request comments
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -8,9 +8,11 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
index de3049f76fa..212b59a0dd6 100644
--- a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.source_code.merge_request_action_monthly
-description:
+description: Count of unique users who perform an action on a merge request
 product_section: dev
 product_stage: create
 product_group: group::code review
-product_category:
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml b/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
index 4f409dbf8c5..c8d0d7eb575 100644
--- a/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
+++ b/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.source_code.i_source_code_code_intelligence_monthly
-description:
+description: Count of unique users who use code intelligence
 product_section: dev
 product_stage: create
-product_group: group::code review
-product_category:
+product_group: group::source code
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml b/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
index a23aed69c72..1c4b558288a 100644
--- a/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_mr_diffs_monthly
-description: Count of unique merge requests per week|month with diffs viewed
+description: Count of unique merge requests per month with diffs viewed
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml b/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
index dd315b5634d..d5fded16ee2 100644
--- a/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_single_file_diffs_monthly
-description: Count of unique users per week|month with diffs viewed file by file
+description: Count of unique users per month with diffs viewed file by file
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml b/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
index 82d1c86d146..eb566473b3a 100644
--- a/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_mr_single_file_diffs_monthly
-description: Count of unique merge requests per week|month with diffs viewed file
+description: Count of unique merge requests per month with diffs viewed file
   by file
 product_section: dev
 product_stage: create
@@ -12,6 +12,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
index 28d4477c037..eb95ff294d8 100644
--- a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_monthly
-description: Count of unique users per week|month who created a MR
+description: Count of unique users per month who created a MR
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml b/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
index c73a5da2585..de9d81070e8 100644
--- a/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_close_mr_monthly
-description: Count of unique users per week|month who closed a MR
+description: Count of unique users per month who closed a MR
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml b/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
index 173ff6a995e..0d954358bbe 100644
--- a/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_reopen_mr_monthly
-description: Count of unique users per week|month who reopened a MR
+description: Count of unique users per month who reopened a MR
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml b/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
index 0c126afeb64..bdbd0346dbd 100644
--- a/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_merge_mr_monthly
-description: Count of unique users per week|month who merged a MR
+description: Count of unique users per month who merged a MR
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
index 1c3801e77bc..bf58a8632b8 100644
--- a/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_comment_monthly
-description: Count of unique users per week|month who commented on a MR
+description: Count of unique users per month who commented on a MR
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
index 5a0bf9346a0..045dbba58b7 100644
--- a/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_edit_mr_comment_monthly
-description: Count of unique users per week|month who edited a comment on a MR
+description: Count of unique users per month who edited a comment on a MR
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
index 9e8f191d7e5..5cd5e005262 100644
--- a/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_remove_mr_comment_monthly
-description: Count of unique users per week|month who removed a comment on a MR
+description: Count of unique users per month who removed a comment on a MR
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml b/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
index 9b3c359b6f0..7ebf2072406 100644
--- a/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
+++ b/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml b/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
index be38418982d..548dddda36f 100644
--- a/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
+++ b/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
@@ -11,6 +11,8 @@ time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
index 5310c4db557..357ca87eac4 100644
--- a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
+++ b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
@@ -1,6 +1,7 @@
 ---
 key_path: usage_activity_by_stage_monthly.configure.clusters_management_project
-description: Total GitLab Managed clusters with defined cluster management project
+name: "count_distinct_user_id_from_management_project_clusters"
+description: Number of Kubernetes clusters with clusters management project being set
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -8,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -16,5 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.management_project_id IS NOT NULL)'>_clusters"
diff --git a/config/metrics/counts_28d/20210216175542_ci_builds.yml b/config/metrics/counts_28d/20210216175542_ci_builds.yml
index 016d6c75cce..0f3d384937c 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.verify.ci_builds
-description: Unique builds in project
+description: Unique monthly builds in project
 product_section: ops
 product_stage: verify
 product_group: group::continuous integration
@@ -8,9 +8,12 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+
diff --git a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
index f67fb96b9ee..bc0a2051097 100644
--- a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.verify.ci_external_pipelines
-description: Total pipelines in external repositories
+description: Total pipelines in external repositories in a month
 product_section: ops
 product_stage: verify
 product_group: group::continuous integration
@@ -8,9 +8,12 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+
diff --git a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
index 66456d42ffe..d04419aebfc 100644
--- a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.verify.ci_internal_pipelines
-description: Total pipelines in GitLab repositories
+description: Total pipelines in GitLab repositories in a month
 product_section: ops
 product_stage: verify
 product_group: group::continuous integration
@@ -8,9 +8,11 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
index 7720ca5d26a..7cfbe4df320 100644
--- a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
@@ -2,15 +2,17 @@
 key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_config_auto_devops
 description: Total pipelines from an Auto DevOps template
 product_section: ops
-product_stage: verify
-product_group: group::continuous integration
-product_category: continuous_integration
+product_stage: configure
+product_group: group::configure
+product_category: auto_devops
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
index 8c125a51f89..c89d4804607 100644
--- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_config_repository
-description: Total Pipelines from templates in repository
+description: Total Monthly Pipelines from templates in repository
 product_section: ops
 product_stage: verify
 product_group: group::continuous integration
@@ -8,9 +8,11 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
index 7464f28fc68..cfea6f49eb5 100644
--- a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_schedules
-description: Pipeline schedules in GitLab
+description: Total monthly Pipeline schedules in GitLab
 product_section: ops
 product_stage: verify
 product_group: group::continuous integration
@@ -8,9 +8,11 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
index b818e52ecb5..55b0250bbbd 100644
--- a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.verify.ci_pipelines
-description: " Distinct users triggering pipelines in a month"
+description:  "Distinct users triggering pipelines in a month"
 product_section: ops
 product_stage: verify
 product_group: group::continuous integration
@@ -8,10 +8,12 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+- free
diff --git a/config/metrics/counts_28d/20210216175556_ci_triggers.yml b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
index f409434feb0..7a06e45b4e4 100644
--- a/config/metrics/counts_28d/20210216175556_ci_triggers.yml
+++ b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
@@ -8,7 +8,7 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
index 754da9e0006..b3a4a9e384d 100644
--- a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
@@ -8,9 +8,11 @@ product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216180956_clusters.yml b/config/metrics/counts_28d/20210216180956_clusters.yml
index eb5d60f8a61..c33a588fed8 100644
--- a/config/metrics/counts_28d/20210216180956_clusters.yml
+++ b/config/metrics/counts_28d/20210216180956_clusters.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.monitor.clusters
-description: Total GitLab Managed clusters both enabled and disabled
+description: Count users creating clusters in last 28 days.
 product_section: ops
 product_stage:
 product_group: group::monitor
@@ -8,9 +8,11 @@ product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
index 97fb359c657..5f2a94cc3ea 100644
--- a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.monitor.clusters_applications_prometheus
-description: Total GitLab Managed clusters with Prometheus enabled
+description: Users creating clusters with Prometheus enabled in last 28 days.
 product_section: ops
 product_stage:
 product_group: group::monitor
@@ -8,9 +8,11 @@ product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
index 96d737d9d14..28391dfb558 100644
--- a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
@@ -4,13 +4,15 @@ description: Active users with enabled operations dashboard
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
index 6a559c1460f..b934fa26cd4 100644
--- a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
@@ -4,13 +4,15 @@ description: Projects with tracing enabled
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: tracing
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml b/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
index caba12d3d44..2872838e54a 100644
--- a/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.monitor.projects_with_error_tracking_enabled
-description:
+description: Count of users creating projects with error tracking enabled.
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
index 2533117f03b..4ef89c2b47d 100644
--- a/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
@@ -4,13 +4,15 @@ description: Active users with projects on operations dashboard
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216181139_issues.yml b/config/metrics/counts_28d/20210216181139_issues.yml
index 46494caaff7..c6c73e11746 100644
--- a/config/metrics/counts_28d/20210216181139_issues.yml
+++ b/config/metrics/counts_28d/20210216181139_issues.yml
@@ -1,18 +1,19 @@
 ---
 key_path: usage_activity_by_stage_monthly.plan.issues
-description: Count of MAU creating issues
+description: Count of users creating Issues in last 28 days.
 product_section: dev
-product_stage: plan 
+product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
+instrumentation_class: CountUsersCreatingIssuesMetric
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
diff --git a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
index b1009642dcc..e828cefc644 100644
--- a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
+++ b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
@@ -9,9 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: CountUsersUsingApproveQuickActionMetric
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
diff --git a/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml b/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml
deleted file mode 100644
index c05835b2100..00000000000
--- a/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.release.projects_mirrored_with_pipelines_enabled
-description: Projects with repository mirroring enabled
-product_section: ops
-product_stage:
-product_group: group::release
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182034_deploy_keys.yml b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
index 80f50c7d1a5..0f5a6b3c03d 100644
--- a/config/metrics/counts_28d/20210216182034_deploy_keys.yml
+++ b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.deploy_keys
-description:
+description: Count of users creating deploy keys in last 28 days.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182036_keys.yml b/config/metrics/counts_28d/20210216182036_keys.yml
index d1299065115..eb82cc1f0e6 100644
--- a/config/metrics/counts_28d/20210216182036_keys.yml
+++ b/config/metrics/counts_28d/20210216182036_keys.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.keys
-description:
+description: Count of users creating regular keys in last 28 days.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
index 6b42f18e664..bb64dcb32ca 100644
--- a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
+++ b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.remote_mirrors
-description:
+description: Count of users creating projects with remote mirrors. Includes both push and pull mirrors.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
index c75efaf0a80..f1f00fe59e3 100644
--- a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
+++ b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_project_repo
-description:
+description: Count of monthly active users who have performed any Git operation (read/write/push)
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
index 25405624b03..de369a47ffb 100644
--- a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
+++ b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_git_write
-description: Aggregated value for wiki, design and project repo actions
+description: Aggregated value for wiki, design, and project repo Git write actions
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml b/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml
deleted file mode 100644
index c47fa49fe06..00000000000
--- a/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.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: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml b/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
deleted file mode 100644
index dfacce63f05..00000000000
--- a/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.projects_with_sectional_code_owner_rules
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml b/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
deleted file mode 100644
index d87b910d239..00000000000
--- a/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.projects_with_repositories_enabled
-description:
-product_section: dev
-product_stage: create
-product_group: group::source code
-product_category: source_code_management
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182051_protected_branches.yml b/config/metrics/counts_28d/20210216182051_protected_branches.yml
index 81d23653307..83c923c173e 100644
--- a/config/metrics/counts_28d/20210216182051_protected_branches.yml
+++ b/config/metrics/counts_28d/20210216182051_protected_branches.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.protected_branches
-description:
+description: Count of users creating projects with repositories making use of at least one protected branch in last 28 days.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -8,9 +8,11 @@ product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
index af59d1a1235..527cc42df22 100644
--- a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.source_code.wiki_action_monthly
-description:
+description: Count of unique actions done on a wiki (create, edit, delete)
 product_section: dev
 product_stage: create
 product_group: group::source code
-product_category:
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
index 8feb369d0fa..971e3defe25 100644
--- a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.source_code.design_action_monthly
-description:
+description: Count of total design actions (upload, delete, comment, reply)
 product_section: dev
 product_stage: create
 product_group: group::source code
-product_category:
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
index 6047e6b6059..d60ec7f438b 100644
--- a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.source_code.project_action_monthly
-description:
+description: Count of unique actions done on projects and related resources (create, edit, delete, comment)
 product_section: dev
 product_stage: create
 product_group: group::source code
-product_category:
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
index a9049c00aa5..b5ba1f7d66b 100644
--- a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
+++ b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts_monthly.projects_with_alerts_created
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Monthly count of unique projects with HTTP alerting enabled
+product_section: ops
+product_stage:
+product_group: group::monitor
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml b/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
deleted file mode 100644
index e3980a944c6..00000000000
--- a/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.total_number_of_path_locks
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml b/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
deleted file mode 100644
index 3808a2f2dcb..00000000000
--- a/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.total_number_of_locked_files
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml b/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml
deleted file mode 100644
index 85ea922568e..00000000000
--- a/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.approval_project_rules_with_more_approvers_than_required
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml b/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml
deleted file mode 100644
index 36a3dccbc95..00000000000
--- a/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.approval_project_rules_with_less_approvers_than_required
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml b/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml
deleted file mode 100644
index a4f7695c505..00000000000
--- a/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.create.approval_project_rules_with_exact_required_approvers
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183753_projects_incident_sla_enabled.yml b/config/metrics/counts_28d/20210216183753_projects_incident_sla_enabled.yml
deleted file mode 100644
index 660a1b1583b..00000000000
--- a/config/metrics/counts_28d/20210216183753_projects_incident_sla_enabled.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.monitor.projects_incident_sla_enabled
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
index eb0ffa26d2a..e0c301b5c03 100644
--- a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.source_code.git_write_action_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique Git write actions
+product_section: dev
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml b/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml
deleted file mode 100644
index 124f322132f..00000000000
--- a/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.ci_secrets_management.i_ci_secrets_management_vault_build_created_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
index 7d981f850e2..915c5e69fba 100644
--- a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
+++ b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.terraform.p_terraform_state_api_unique_users_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Monthly active users of GitLab Managed Terraform states
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
index 12d7e8ab749..b562a0c63d5 100644
--- a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
+++ b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_toggled_task_item_status_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who toggled a task item in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
index 1df3325b027..cb0062c55a3 100644
--- a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_approve_mr_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who approve a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
index 527105a58fe..ce32c3ac89b 100644
--- a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_unapprove_mr_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who unapprove a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
index cdf2d1135aa..b1c33edd117 100644
--- a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_resolve_thread_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who resolve a thread in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
index d4a27feb8f3..4200abff4fc 100644
--- a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_unresolve_thread_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who unresolve a thread in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
index 27899299abb..8cca5731801 100644
--- a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_edit_mr_title_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who edit the title of a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
index ad564e57ab7..6fcc94e5337 100644
--- a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
+++ b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_edit_mr_desc_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who edit the description of a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
index 10c13e8796f..5a11b327699 100644
--- a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
+++ b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_create_review_note_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who create a note as part of a merge request review
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
index a6bac39ace0..3b8df2a615b 100644
--- a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_publish_review_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who publish their review as part of a merge request review
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
index 937e17e3daf..717476547a8 100644
--- a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_create_multiline_mr_comment_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who create a multiline comment in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
index c88078ffa2b..8d797856907 100644
--- a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_edit_multiline_mr_comment_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per week who edit a multiline comment in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
index 1bd3172b9f6..867e6333c10 100644
--- a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_remove_multiline_mr_comment_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who remove a multiline comment in a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
index 594393e33d6..7c2545bd383 100644
--- a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_assigned_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who are assigned to a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
index 8bbaa0dc420..dd79d196318 100644
--- a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_marked_as_draft_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who mark a merge request as a draft
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
index f294f887c99..42285f42ac4 100644
--- a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_unmarked_as_draft_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who unmark a merge request as a draft
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
index d3c4647abbb..664dfb2c36d 100644
--- a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
+++ b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_review_requested_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who request a review of a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
index afbf5e0f3f5..735f3f23d67 100644
--- a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_added_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who add an approval rule to a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
index 565e1346a62..e32c033f22f 100644
--- a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
+++ b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_deleted_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who delete an approval rule to a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
index c21e94ab4ab..ca8baf5a5a4 100644
--- a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_edited_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who delete an approval rule to a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
index c1f06831606..d5cf11af2a5 100644
--- a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_vs_code_api_request_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who use GitLab Workflow for VS Code
+product_stage: create
+product_group: group::code review
+product_category: editor_extension
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
index a985393fa6b..b8ed6e7b1cd 100644
--- a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_from_issue_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who create a merge request from an issue
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
index 72590d59bd1..8881a5a7508 100644
--- a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
@@ -1,16 +1,17 @@
 ---
 key_path: redis_hll_counters.code_review.code_review_total_unique_counts_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of unique users per month who interact with a merge request
+product_stage: create
+product_group: group::code review
+product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
-- free
-skip_validation: true
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
index e5931e25cdd..53ecb748e05 100644
--- a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines with implicit Auto DevOps runs
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
index 7d52a2807e6..eb9df486c8c 100644
--- a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_build_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines with implicit Auto Build runs
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
index 1f753124f46..dba5b22c3d9 100644
--- a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_deploy_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines with implicit Auto Deploy runs
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
index 62ee737153d..5e1b1c837b0 100644
--- a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
+++ b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of projects using 5 min production app CI template in last 7 days.
+product_section: seg
+product_stage: deploy
+product_group: "group::5-min-app"
+product_category: five_minute_production_app
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
index 55f938dfce1..982c62a62f6 100644
--- a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines using the Auto DevOps template
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
index 0f94788b355..3e00fd8c784 100644
--- a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_cf_deploy_ec2_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: "Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.yml` template in last 28 days."
+product_section: ops
+product_stage: release
+product_group: "group::release"
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
index 2483245b23d..ef6b254a6b4 100644
--- a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_deploy_ecs_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: "Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in last 28 days."
+product_section: ops
+product_stage: release
+product_group: "group::release"
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
index 7ce990172df..3b272166ed8 100644
--- a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_build_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines using the Auto Build template
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
index a585ef5fbb9..2c66fbbd95f 100644
--- a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines using the stable Auto Deploy template
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
index 2e5b87677e1..d7ba2da5d9f 100644
--- a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_latest_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines using the latest Auto Deploy template
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
index fac0fa40406..866ec122f28 100644
--- a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_base_latest_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines that include the terraform base template from GitLab
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml b/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
new file mode 100644
index 00000000000..00ddefe4901
--- /dev/null
+++ b/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.i_package_terraform_module_deploy_token_monthly
+description: Number of distinct users authorized via deploy token creating Terraform Module packages in recent 28 days
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
+time_frame: 28d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml b/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
new file mode 100644
index 00000000000..75accebea99
--- /dev/null
+++ b/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.user_packages.i_package_terraform_module_user_monthly
+description: Number of distinct users creating Terraform Module packages in recent 28 days
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
+time_frame: 28d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml b/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
new file mode 100644
index 00000000000..2bcd2a448ec
--- /dev/null
+++ b/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_click_single_file_mode_setting_monthly
+description: Count of users clicking single file mode setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml b/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
new file mode 100644
index 00000000000..3b7c5be9b84
--- /dev/null
+++ b/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_click_file_browser_setting_monthly
+description: Count of users clicking merge request file browser setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml b/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
new file mode 100644
index 00000000000..31fe497fe0e
--- /dev/null
+++ b/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_click_whitespace_setting_monthly
+description: Count of users clicking merge request whitespae setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml b/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
new file mode 100644
index 00000000000..821f7244209
--- /dev/null
+++ b/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_view_inline_monthly
+description: Count of users with merge request view type as inline
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml b/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
new file mode 100644
index 00000000000..04ff06143af
--- /dev/null
+++ b/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_view_parallel_monthly
+description: Count of users with merge request view type as parallel
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml b/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
new file mode 100644
index 00000000000..ad5b5e835c1
--- /dev/null
+++ b/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_file_browser_tree_view_monthly
+description: Count of users with merge request file tree setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml b/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
new file mode 100644
index 00000000000..c71bacd6004
--- /dev/null
+++ b/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_file_browser_list_view_monthly
+description: Count of users with merge request file list setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml b/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
new file mode 100644
index 00000000000..0d17fa0d965
--- /dev/null
+++ b/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_show_whitespace_monthly
+description: Count of users with show whitespace enabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml b/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
new file mode 100644
index 00000000000..6038bb5cda8
--- /dev/null
+++ b/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_hide_whitespace_monthly
+description: Count of users with show whitespace disabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml b/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
new file mode 100644
index 00000000000..3cfcdf23a47
--- /dev/null
+++ b/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_single_file_monthly
+description: Count of users with single file mode enabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml b/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
new file mode 100644
index 00000000000..16784a0c408
--- /dev/null
+++ b/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_multiple_files_monthly
+description: Count of users with single mode disabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
new file mode 100644
index 00000000000..224fd6477cc
--- /dev/null
+++ b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts_monthly.aggregated_metrics.code_review_category_monthly_active_users
+name: "0"
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 28d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
new file mode 100644
index 00000000000..ba872d725df
--- /dev/null
+++ b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts_monthly.aggregated_metrics.code_review_extension_category_monthly_active_users
+name: "0"
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 28d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
new file mode 100644
index 00000000000..e0e6bb0567d
--- /dev/null
+++ b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts_monthly.aggregated_metrics.code_review_group_monthly_active_users
+name: "0"
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 28d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
new file mode 100644
index 00000000000..594df7ebe26
--- /dev/null
+++ b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
@@ -0,0 +1,22 @@
+---
+key_path: redis_hll_counters.pipeline_authoring.pipeline_authoring_total_unique_counts_monthly
+name: "0"
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 28d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml b/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml
new file mode 100644
index 00000000000..0f68989cc1d
--- /dev/null
+++ b/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml
@@ -0,0 +1,22 @@
+---
+key_path: usage_activity_by_stage_monthly.enablement.geo_secondary_web_oauth_users
+name: ""
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 28d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true