Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

427 files changed, 547 insertions, 434 deletions

diff --git a/config/metrics/counts_28d/20210201124930_deployments.yml b/config/metrics/counts_28d/20210201124930_deployments.yml
index 385bdb47484..56ea95bdb69 100644
--- a/config/metrics/counts_28d/20210201124930_deployments.yml
+++ b/config/metrics/counts_28d/20210201124930_deployments.yml
@@ -4,7 +4,7 @@ key_path: counts_monthly.deployments
 description: Total deployments count for recent 28 days
 product_section: ops
 product_stage: release
-product_group: group::ops release
+product_group: ops_release
 product_category:
 value_type: number
 status: active
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 791cad7b6e2..e766c555d3a 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
@@ -4,7 +4,7 @@ key_path: analytics_unique_visits.analytics_unique_visits_for_any_target_monthly
 description: Unique visitors to any analytics feature by month
 product_section: dev
 product_stage: manage
-product_group: group::optimize
+product_group: optimize
 product_category:
 value_type: number
 status: active
@@ -33,6 +33,13 @@ options:
   - p_analytics_ci_cd_pipelines
   - p_analytics_ci_cd_deployment_frequency
   - p_analytics_ci_cd_lead_time
+  - p_analytics_ci_cd_time_to_restore_service
+  - p_analytics_ci_cd_change_failure_rate
+  - g_analytics_ci_cd_release_statistics
+  - g_analytics_ci_cd_deployment_frequency
+  - g_analytics_ci_cd_lead_time
+  - g_analytics_ci_cd_time_to_restore_service
+  - g_analytics_ci_cd_change_failure_rate
 distribution:
 - ce
 - ee
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 e0f19ac36f0..f053d0870ac 100644
--- a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.analytics.p_analytics_pipelines_monthly
 description: Unique visitors to /groups/:group/-/analytics/ci_cd by month
 product_section: dev
 product_stage: manage
-product_group: group::optimize
+product_group: optimize
 product_category:
 value_type: number
 status: active
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 95861042b1c..c92230af6b8 100644
--- a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
+++ b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.analytics.p_analytics_valuestream_monthly
 description: Unique visitors to /:group/:project/-/value_stream_analytics by month
 product_section: dev
 product_stage: manage
-product_group: group::optimize
+product_group: optimize
 product_category:
 value_type: number
 status: active
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 0b235a98677..553161c1470 100644
--- a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
+++ b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.analytics.i_analytics_cohorts_monthly
 description: "Unique visitors to /-/instance_statistics/cohorts"
 product_section: fulfillment
 product_stage: fulfillment
-product_group: group::utilization
+product_group: utilization
 product_category:
 value_type: number
 status: active
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 016cbb23d49..2de313948aa 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.analytics.i_analytics_dev_ops_score_monthly
 description: Unique visitors to /admin/dev_ops_reports by month
 product_section: dev
 product_stage: manage
-product_group: group::optimize
+product_group: optimize
 product_category:
 value_type: number
 status: active
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 1f5e3108758..af4493b676b 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.analytics.g_analytics_merge_request_monthly
 description:
 product_section: dev
 product_stage: manage
-product_group: group::optimize
+product_group: optimize
 product_category:
 value_type: number
 status: removed
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 b2e6ce34d2e..798c16fd68f 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.analytics.i_analytics_instance_statistics_monthly
 description: Unique visitors to /admin/usage_trends by month
 product_section: dev
 product_stage: manage
-product_group: group::optimize
+product_group: optimize
 product_category:
 value_type: number
 status: active
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 b4ac7032df6..30de14c43f0 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.analytics.analytics_total_unique_counts_monthly
 description: The number of unique users who visited any analytics feature by month
 product_section: dev
 product_stage: manage
-product_group: group::optimize
+product_group: optimize
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175055_merge_requests.yml b/config/metrics/counts_28d/20210216175055_merge_requests.yml
index c57b9e281cf..a66896951f7 100644
--- a/config/metrics/counts_28d/20210216175055_merge_requests.yml
+++ b/config/metrics/counts_28d/20210216175055_merge_requests.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.create.merge_requests
 description: Count distinct authors of merge requests
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: removed
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 e3ba4019000..5db58dd93ae 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
@@ -5,7 +5,7 @@ description: Count of the number of projects with setting to disable overriding
   per merge request
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
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 eaf3bc545c0..32a68c1de56 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
@@ -5,7 +5,7 @@ description: Count of the number of projects without setting to disable overridi
   approvers per merge request
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
index e5b5300dae3..07ad35e45bf 100644
--- a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
+++ b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.create.merge_requests_users
 description: Distinct count of users performing merge request actions like closed, merged, created, commented
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175109_suggestions.yml b/config/metrics/counts_28d/20210216175109_suggestions.yml
index 27288e43eee..7f4e0569e25 100644
--- a/config/metrics/counts_28d/20210216175109_suggestions.yml
+++ b/config/metrics/counts_28d/20210216175109_suggestions.yml
@@ -5,7 +5,7 @@ description: Count of unique users per month who create suggestions in merge req
   comments
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: removed
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 abd5157271a..5a6150b21af 100644
--- a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.source_code.merge_request_action_monthly
 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_group: code_review
 product_category: code_review
 value_type: number
 status: active
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 aa0c6e6136c..1329aff088d 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.source_code.i_source_code_code_intelligence_monthly
 description: Count of unique users who use code intelligence
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
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 9ca7370c953..8d88ab365bd 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_mr_diffs_monthly
 description: Count of unique merge requests per month with diffs viewed
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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 62cbdb0feb5..263a59891b4 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_single_file_diffs_mo
 description: Count of unique users per month with diffs viewed file by file
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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 67955a7d32b..8370eb21f36 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_mr_single_file_diffs_mont
 description: Count of unique merge requests per month with diffs viewed file by file
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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 c88cff6b2f9..a6bfeed7059 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_monthly
 description: Count of unique users per month who created a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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 df3a461d7c8..c8f2386e908 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_close_mr_monthly
 description: Count of unique users per month who closed a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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 a1b8c4037be..2f3c61f4f3c 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_reopen_mr_monthly
 description: Count of unique users per month who reopened a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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 98e413605f0..de20c8fdc7a 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_merge_mr_monthly
 description: Count of unique users per month who merged a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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 c968aee2190..761683fe34f 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_comment_mo
 description: Count of unique users per month who commented on a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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 f82608a637c..16351810c6f 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_edit_mr_comment_mont
 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
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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 056b7d70e47..c15d962b0de 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_remove_mr_comment_mo
 description: Count of unique users per month who removed a comment on a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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 03a0a97423b..d28e463dc1b 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_add_suggestion_month
 description: Count of unique users per month who added a suggestion
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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 483d06265fc..6ed0515fec5 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_apply_suggestion_mon
 description: Count of unique users per month who applied a suggestion
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
index 76627a91d0f..71304cdcc77 100644
--- a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_applications_cert_m
 description: Count user ids from GitLab Managed clusters with Cert Manager enabled
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
index ced2b454844..c772e7ba6cb 100644
--- a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
+++ b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_applications_helm
 description: Count user ids from GitLab Managed clusters with Helm enabled
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
index eee58397947..0a36f99563f 100644
--- a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
+++ b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_applications_ingres
 description: Count user ids from GitLab Managed clusters with Ingress enabled
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
index f12fe191220..e01b941912f 100644
--- a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
+++ b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_applications_knativ
 description: Count user ids from GitLab Managed clusters with Knative enabled
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
index 0d908d3c45d..708c1e64326 100644
--- a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
+++ b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
@@ -6,7 +6,7 @@ description: Number of Kubernetes clusters with clusters management project bein
   set
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
index f6296b5429b..b91eed1c015 100644
--- a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_disabled
 description: Number of user ids from GitLab Managed disabled clusters
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
index 9df51868bef..2c56b369b49 100644
--- a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_enabled
 description: Number of distict user ids from GitLab Managed clusters currently enabled
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
index 9a9db498d6a..3b7c869c851 100644
--- a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
+++ b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_gke
 description: Number of user ids from GitLab Managed clusters provisioned with GitLab on GCE GKE
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
index ff7ab633e81..b48556ca885 100644
--- a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
+++ b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_eks
 description: Number of user ids from GitLab Managed clusters provisioned with GitLab on AWS EKS
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
index c548b9e9eff..f9e5657144c 100644
--- a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
+++ b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_user
 description: Number of user ids from GitLab Managed clusters that are user provisioned
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
index 7bdb34f236c..399046a2d6d 100644
--- a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.instance_clusters_disabled
 description: Number of users from GitLab Managed disabled clusters attached to the instance
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
index 81022cc7411..059e26a137b 100644
--- a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.instance_clusters_enabled
 description: Number of user ids from GitLab Managed enabled clusters attached to the instance
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
index d38d34867ff..dbc86047521 100644
--- a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.group_clusters_disabled
 description: Number of user ids GitLab Managed disabled clusters attached to groups
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
index 9d53421eb69..e1ff7306af0 100644
--- a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.group_clusters_enabled
 description: Count disctinct user ids from GitLab Managed enabled clusters attached to groups
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
index 10806cc50fd..edf02be00dd 100644
--- a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.project_clusters_disabled
 description: Number of user ids from GitLab Managed disabled clusters attached to projects
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
index 28b81acb709..2b601bf2760 100644
--- a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.project_clusters_enabled
 description: Number of user ids from GitLab Managed enabled clusters attached to projects
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175542_ci_builds.yml b/config/metrics/counts_28d/20210216175542_ci_builds.yml
index 8664ee1bcc9..454b02bd04d 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.verify.ci_builds
 description: Unique monthly builds in project
 product_section: ops
 product_stage: verify
-product_group: group::pipeline execution
+product_group: pipeline_execution
 product_category: continuous_integration
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
index d21d70c8abb..1de544315ab 100644
--- a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.verify.ci_external_pipelines
 description: Total pipelines in external repositories in a month
 product_section: ops
 product_stage: verify
-product_group: group::pipeline execution
+product_group: pipeline_execution
 product_category: continuous_integration
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
index 47bf8c9c821..94faa5b1833 100644
--- a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.verify.ci_internal_pipelines
 description: Total pipelines in GitLab repositories in a month
 product_section: ops
 product_stage: verify
-product_group: group::pipeline execution
+product_group: pipeline_execution
 product_category: continuous_integration
 value_type: number
 status: active
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 934d9f77c24..6bda7c714d7 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
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_config_auto_devops
 description: Distinct users that ran an auto DevOps pipeline without a .gitlab-ci.yml file.
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: auto_devops
 value_type: number
 status: active
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 9d12339717d..5253731dcc8 100644
--- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_config_repository
 description: Monthly count of unique users creating pipelines from CI files in the repository
 product_section: ops
 product_stage: verify
-product_group: group::pipeline execution
+product_group: pipeline_execution
 product_category: continuous_integration
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
index bfc39e672ca..323606abd00 100644
--- a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_schedules
 description: Total monthly Pipeline schedules in GitLab
 product_section: ops
 product_stage: verify
-product_group: group::pipeline execution
+product_group: pipeline_execution
 product_category: continuous_integration
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
index 3c0c401f38b..da338611257 100644
--- a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.verify.ci_pipelines
 description: Distinct users triggering pipelines in a month
 product_section: ops
 product_stage: verify
-product_group: group::pipeline execution
+product_group: pipeline_execution
 product_category: continuous_integration
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216175556_ci_triggers.yml b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
index c70a9337c6c..4fd645a39cd 100644
--- a/config/metrics/counts_28d/20210216175556_ci_triggers.yml
+++ b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.verify.ci_triggers
 description: Total configured Triggers in project
 product_section: ops
 product_stage: verify
-product_group: group::pipeline execution
+product_group: pipeline_execution
 product_category: continuous_integration
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180308_personal_snippets.yml b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
index 2416212f1eb..3b036d022c7 100644
--- a/config/metrics/counts_28d/20210216180308_personal_snippets.yml
+++ b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
@@ -4,7 +4,7 @@ key_path: counts_monthly.personal_snippets
 description: Monthly count of personal Snippets
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: snippets
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180310_project_snippets.yml b/config/metrics/counts_28d/20210216180310_project_snippets.yml
index 4a0a02f701d..8dc9caee45b 100644
--- a/config/metrics/counts_28d/20210216180310_project_snippets.yml
+++ b/config/metrics/counts_28d/20210216180310_project_snippets.yml
@@ -4,7 +4,7 @@ key_path: counts_monthly.project_snippets
 description: Monthly count of project Snippets
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: snippets
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180312_snippets.yml b/config/metrics/counts_28d/20210216180312_snippets.yml
index 214ceaa7740..dfe24039f52 100644
--- a/config/metrics/counts_28d/20210216180312_snippets.yml
+++ b/config/metrics/counts_28d/20210216180312_snippets.yml
@@ -4,7 +4,7 @@ key_path: counts_monthly.snippets
 description: Monthly count of All Snippets
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: snippets
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180317_snippets.yml b/config/metrics/counts_28d/20210216180317_snippets.yml
index a80991452c3..21c1196f241 100644
--- a/config/metrics/counts_28d/20210216180317_snippets.yml
+++ b/config/metrics/counts_28d/20210216180317_snippets.yml
@@ -5,7 +5,7 @@ name: count_distinct_author_id_from_snippets
 description: Count of distinct author_id from snippets for last 28 days
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: snippets
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
index b9982520cbc..dd66f4a3b47 100644
--- a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_web
 description: Number of users editing using web IDE
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: web_ide
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
index a3eb1192e49..8dbf5e5ba41 100644
--- a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
+++ b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_sfe
 description: Number of users using single file editor
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: web_ide
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
index 3dc7f774fe2..5a2d9c197ce 100644
--- a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
+++ b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_sni
 description: Number of users using the snippet editor
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: snippets
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
index 0c6421ad1fa..79f1db5e730 100644
--- a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
+++ b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_sse
 description: Number of users using the static site editor
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: static_site_editor
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
index 76e24559ff2..2b5b0eaa2cc 100644
--- a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_ide
 description: Number of unique users per month who edited a file from any web editor
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: web_ide
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
index 2e00a23ca7c..afd69a800cc 100644
--- a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ide_edit.g_edit_by_web_ide_monthly
 description: Number of users editing a file from the Web IDE
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: web_ide
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
index 88d7c43a90e..78622d0fc18 100644
--- a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
+++ b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ide_edit.g_edit_by_sfe_monthly
 description: Number of users editing a file from the single file editor
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: web_ide
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
index 78a01d5ef64..5e3ee643e07 100644
--- a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ide_edit.g_edit_by_snippet_ide_monthly
 description: Count of monthly edits to a snippet
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: snippets
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
index 35291d12239..6aadaed5180 100644
--- a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ide_edit.ide_edit_total_unique_counts_monthly
 description: Count of unique users per month who edited a file from the Web IDE
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: web_ide
 value_type: number
 status: active
@@ -16,6 +16,7 @@ options:
   - g_edit_by_web_ide
   - g_edit_by_sfe
   - g_edit_by_snippet_ide
+  - g_edit_by_live_preview
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
index e85084f25f0..0d4a62696b7 100644
--- a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
+++ b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.search.i_search_total_monthly
 description: Calculated unique users to perform Basic or Advanced searches by month
 product_section: enablement
 product_stage: enablement
-product_group: group::global search
+product_group: global_search
 product_category: global_search
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
index aad1d911a6f..b38129071bf 100644
--- a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
@@ -7,7 +7,7 @@ description: Total unique users for i_search_total, i_search_advanced, i_search_
   just want the total
 product_section: enablement
 product_stage: enablement
-product_group: group::global search
+product_group: global_search
 product_category: global_search
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
index 9bed122a0a5..1632aed611a 100644
--- a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
@@ -4,7 +4,7 @@ key_path: counts_monthly.aggregated_metrics.incident_management_alerts_total_uni
 description: Count of unique users per month to take an action on an alert
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: incident_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
index 3e0aed47e2d..3174894384a 100644
--- a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
@@ -4,7 +4,7 @@ key_path: counts_monthly.aggregated_metrics.incident_management_incidents_total_
 description: Count of unique users per month to take an action on an incident
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: incident_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
index c2b1d11d2e9..405a43b3766 100644
--- a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
+++ b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.monitor.projects_with_incidents
 description: Count of unique projects with an incident created in the last month
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: incident_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
index 2d17b84f7de..e0aa35fea62 100644
--- a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
@@ -5,7 +5,7 @@ description: Count of unique projects with an incident from an alert created in
   last month
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: incident_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml b/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
index 23c7b6172fd..e1c9d40715c 100644
--- a/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_alert_statu
 description: Count of unique users changing alert's status changes per month
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml b/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
index 3d77ae78849..c3bacf2d529 100644
--- a/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_alert_assig
 description: Count of unique users assigning an alert per month
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml b/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
index 68a99ecae82..8d8239e5403 100644
--- a/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_alert_todo_
 description: Count of unique users adding alerts to the TODO list per month
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml b/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
index 6df78064a8a..3f6af2826c5 100644
--- a/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_cr
 description: Count of unique users creating incidents per month
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml b/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
index 1ffce106c7d..7684c4714d4 100644
--- a/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_re
 description: Count of unique users reopening incidents per month
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml b/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
index 0f02aef017c..b769652890b 100644
--- a/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_cl
 description: Count of users closing incidents per month
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml b/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
index 6130cb51ef5..ac4aedc8be6 100644
--- a/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_as
 description: Count of users assigning incidents per month
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml b/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
index a4affa056c9..3cdfe2a3bf3 100644
--- a/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_to
 description: Count of unique users adding incidents to the TODO list per month
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml b/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
index 4b7880627a2..cb6dd8ce5c2 100644
--- a/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_co
 description: Count of unique users adding comments per month on incidents
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml b/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
index 11a53605434..a4ecf832a9e 100644
--- a/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
+++ b/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_zo
 description: Count of users creating Zoom meetings about incidents per month
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml b/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
index ee1e29f0caf..b060d0c8c2a 100644
--- a/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding issues per month that are related to a
   incident
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml b/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
index b24e653bda5..af2b7b26610 100644
--- a/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
+++ b/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_un
 description: Count of users removing issues that are related to an incident per month
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml b/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
index 78a52e1f4bf..92e2413f93a 100644
--- a/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_ch
 description: Count of users changing incidents to confidential per month
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
index 9bc738cee98..ab0ddaf32e9 100644
--- a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_total_uniqu
 description: Count of unique users performing events related with incidents per month
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml b/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
index 379f9ec1a3c..e8791ee4ea6 100644
--- a/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
+++ b/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users per month to create an incident corresponding
   an alert
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: incident_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml b/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
index fd9b3ed719a..6c2f8f75861 100644
--- a/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
+++ b/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.create.projects_imported_from_github
 description: Count of projects imported from GitHub
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
index 5189d4685d0..28b876507a7 100644
--- a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
+++ b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_des
 description: Monthly active users for design management
 product_section: dev
 product_stage: plan
-product_group: group::product planning
+product_group: product_planning
 product_category: design_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
index cc950591e6e..9e1c5477bab 100644
--- a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
+++ b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_wik
 description: Unique monthly active users of the Wiki
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: wiki
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180814_events.yml b/config/metrics/counts_28d/20210216180814_events.yml
index 8e974979ae8..3d3d9015e57 100644
--- a/config/metrics/counts_28d/20210216180814_events.yml
+++ b/config/metrics/counts_28d/20210216180814_events.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.events
 description: Number of distinct users who have generated a manage event by month
 product_section: dev
 product_stage: manage
-product_group: group::manage
+product_group: manage
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180816_groups.yml b/config/metrics/counts_28d/20210216180816_groups.yml
index 9ddb7547644..806b78be7b6 100644
--- a/config/metrics/counts_28d/20210216180816_groups.yml
+++ b/config/metrics/counts_28d/20210216180816_groups.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.groups
 description: Number of users who are group members for last 28 days
 product_section: dev
 product_stage: manage
-product_group: group::authentication and authorization
+product_group: authentication_and_authorization
 product_category: subgroups
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180818_users_created.yml b/config/metrics/counts_28d/20210216180818_users_created.yml
index 80fef7467e0..b4646b3e012 100644
--- a/config/metrics/counts_28d/20210216180818_users_created.yml
+++ b/config/metrics/counts_28d/20210216180818_users_created.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.users_created
 description: Number of users created in the month
 product_section: dev
 product_stage: manage
-product_group: group::authentication and authorization
+product_group: authentication_and_authorization
 product_category: users
 value_type: number
 status: active
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 a67113825e8..bfbad28ff80 100644
--- a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.projects_with_prometheus_ale
 description: Projects with Prometheus alerting enabled
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: metrics
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216180956_clusters.yml b/config/metrics/counts_28d/20210216180956_clusters.yml
index 6b9015dbdfe..f5100e8a67e 100644
--- a/config/metrics/counts_28d/20210216180956_clusters.yml
+++ b/config/metrics/counts_28d/20210216180956_clusters.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.monitor.clusters
 description: Count users creating clusters in last 28 days.
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: metrics
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
index 895746f5121..ce391200627 100644
--- a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.monitor.clusters_applications_promethe
 description: Users creating clusters with Prometheus enabled in last 28 days.
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: metrics
 value_type: number
 status: removed
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 0870789a515..47321b7b6c9 100644
--- a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.monitor.operations_dashboard_default_d
 description: Active users with enabled operations dashboard
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: metrics
 value_type: number
 status: active
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 60b1ca2b765..d0e433af157 100644
--- a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
@@ -4,10 +4,10 @@ key_path: usage_activity_by_stage_monthly.monitor.projects_with_tracing_enabled
 description: Projects with tracing enabled
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: tracing
 value_type: number
-status: active
+status: removed
 time_frame: 28d
 data_source: database
 distribution:
@@ -19,3 +19,5 @@ tier:
 - ultimate
 performance_indicator_type: []
 milestone: "<13.9"
+milestone_removed: "15.2"
+removed_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90607"
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 3267d7d4412..0f6696d1666 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
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.monitor.projects_with_error_tracking_e
 description: Count of users creating projects with error tracking enabled.
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: metrics
 value_type: number
 status: active
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 612a6f9be40..037da98e5fa 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,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.monitor.operations_dashboard_users_wit
 description: Active users with projects on operations dashboard
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: metrics
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181050_packages.yml b/config/metrics/counts_28d/20210216181050_packages.yml
index 966f3fa48a3..39af30e7b21 100644
--- a/config/metrics/counts_28d/20210216181050_packages.yml
+++ b/config/metrics/counts_28d/20210216181050_packages.yml
@@ -4,7 +4,7 @@ key_path: counts_monthly.packages
 description: A monthly count of packages published to the registry
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
index 17749102974..ff4a0887c01 100644
--- a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
+++ b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.package.projects_with_packages
 description: The total number of projects in a given month with at least one package
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181139_issues.yml b/config/metrics/counts_28d/20210216181139_issues.yml
index de5238e3e77..13b38a681b1 100644
--- a/config/metrics/counts_28d/20210216181139_issues.yml
+++ b/config/metrics/counts_28d/20210216181139_issues.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.plan.issues
 description: Count of users creating Issues in last 28 days.
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181141_notes.yml b/config/metrics/counts_28d/20210216181141_notes.yml
index 280722a8a1c..3bb61debcc0 100644
--- a/config/metrics/counts_28d/20210216181141_notes.yml
+++ b/config/metrics/counts_28d/20210216181141_notes.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.plan.notes
 description: Count of MAU commenting on an issuable
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181143_projects.yml b/config/metrics/counts_28d/20210216181143_projects.yml
index daad51c1409..4d9de3799ad 100644
--- a/config/metrics/counts_28d/20210216181143_projects.yml
+++ b/config/metrics/counts_28d/20210216181143_projects.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.plan.projects
 description: Count of MAU creating projects
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: projects
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181145_todos.yml b/config/metrics/counts_28d/20210216181145_todos.yml
index ad42b23ceb9..9cffb8c2b35 100644
--- a/config/metrics/counts_28d/20210216181145_todos.yml
+++ b/config/metrics/counts_28d/20210216181145_todos.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.plan.todos
 description: Count of MAU creating todos
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
index b0f78840daa..a2a3d0e297f 100644
--- a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.plan.service_desk_enabled_projects
 description: Count creator ids from projects with service desk enabled
 product_section: dev
 product_stage: plan
-product_group: group::product planning
+product_group: product_planning
 product_category: service_desk
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
index 1b5d647fa0d..8ca0b6a55c3 100644
--- a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
+++ b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.plan.service_desk_issues
 description: Count of service desk issues
 product_section: dev
 product_stage: plan
-product_group: group::plan
+product_group: plan
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
index 84edf3f7e9c..dcfe0bb5638 100644
--- a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
+++ b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.plan.projects_jira_active
 description: Distinct count of creator_id from projects with an active Jira integration.
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
index 07955a6cad1..9c2a821ea1d 100644
--- a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
@@ -5,7 +5,7 @@ description: Distinct count of creator_id from projects with an active Jira Clou
   DVCS integration.
 product_section: dev
 product_stage: ecosystem
-product_group: group::integration
+product_group: integration
 product_category: integrations
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
index e87b69c266b..214dd882f1f 100644
--- a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
@@ -5,7 +5,7 @@ description: Distinct count of creator_id from projects with an active Jira Serv
   DVCS integration.
 product_section: dev
 product_stage: ecosystem
-product_group: group::integration
+product_group: integration
 product_category: integrations
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181158_epics.yml b/config/metrics/counts_28d/20210216181158_epics.yml
index aa3658b03bd..0c913b31f6d 100644
--- a/config/metrics/counts_28d/20210216181158_epics.yml
+++ b/config/metrics/counts_28d/20210216181158_epics.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.plan.epics
 description: Count distinct author ids from epics
 product_section: dev
 product_stage: plan
-product_group: group::product planning
+product_group: product_planning
 product_category: epics
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181200_label_lists.yml b/config/metrics/counts_28d/20210216181200_label_lists.yml
index 3b97c6eb94c..a35840cf395 100644
--- a/config/metrics/counts_28d/20210216181200_label_lists.yml
+++ b/config/metrics/counts_28d/20210216181200_label_lists.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.plan.label_lists
 description: Count of MAU creating label lists on Boards
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: boards
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
index 8e2b416af70..b61909074df 100644
--- a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_title_change
 description: Count of MAU editing an issue title
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
index 942ad55d540..7aa9aec3e83 100644
--- a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_description_
 description: Count of MAU editing an issue description
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
index 734da3e5403..a7ac8e5ff84 100644
--- a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_assignee_cha
 description: Count of MAU changing issue assignees
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
index 45cc0d88c4d..10ce645e3c1 100644
--- a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_confide
 description: Count of MAU making an issue confidential
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
index 4109da5e9e1..5264a1b5d7f 100644
--- a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
+++ b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_visible
 description: Count of MAU making an issue not confidential
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
index 0e8df458927..9d8424e05f8 100644
--- a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_created_mont
 description: Count of MAU creating new issues
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
index 3334d9518ef..4c8177c17b3 100644
--- a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_closed_month
 description: Count of MAU closing an issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
index 66034b7d1e4..4c09b7ee20c 100644
--- a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_reopened_mon
 description: Count of MAU re-opening a closed issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
index ccb50cc01d5..3d50e6cd9b7 100644
--- a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_label_change
 description: Count of MAU changing an issue's label
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
index 5dc6c335f34..af66e66109a 100644
--- a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_milestone_ch
 description: Count of MAU changing an issue's milestone
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
index b2da497f7bf..b1c9d8b9fde 100644
--- a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
+++ b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_cross_refere
 description: Count of MAU referencing an issue from somewhere else
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
index a76a89646da..4b12bba4a5d 100644
--- a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
+++ b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_moved_monthl
 description: Count of MAU moving an issue to another project
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
index 43a3e4a7d46..0bd107cdaed 100644
--- a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
+++ b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_related_mont
 description: Count of MAU relating an issue to another issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
index db3a3eb2a8f..fe0942b44b5 100644
--- a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
+++ b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_unrelated_mo
 description: Count of MAU unrelating an issue to another issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
index 39185b34916..882eb5d1ac2 100644
--- a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_marked_as_du
 description: Count of MAU marking an issue as a duplicate
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
index c0d6bb6dd94..b8eb3dcf218 100644
--- a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_locked_month
 description: Count of MAU locking an issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
index 927e5abdb69..7260222961c 100644
--- a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_unlocked_mon
 description: Count of MAU unlocking an issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
index 10a0aa99000..6022e93b0a5 100644
--- a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_adde
 description: Count of MAU adding a design to an issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
index 9583b98427e..95543c6093d 100644
--- a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
+++ b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_modi
 description: Count of MAU modifying a design on an issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
index 2df771c4aba..85341debfb7 100644
--- a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_remo
 description: Count of MAU removing a design from an issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
index 5c1d36a2795..60c293fd04d 100644
--- a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_due_date_cha
 description: Count of MAU changing an issue due date
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
index 55ebaaf73bf..db15f121047 100644
--- a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_estimat
 description: Count of MAU changing an issue time estimate
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: time_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
index 0551e7607ec..50dcf6156b1 100644
--- a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_spent_c
 description: Count of MAU recording time spent on an issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: time_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
index d6876e29cb4..38532866753 100644
--- a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_adde
 description: Count of MAU commenting on an issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
index 0347b00d871..944b706bdc5 100644
--- a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_edit
 description: Count of MAU editing a comment on an issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
index f2ef56645a2..201d9d5f169 100644
--- a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_remo
 description: Count of MAU deleting a comment from an issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
index d0da9b74eb8..6aa874e0703 100644
--- a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
+++ b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_cloned_month
 description: Count of MAU cloning an issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
index 7d490a3dc95..fd67504fee9 100644
--- a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.issues_edit_total_unique_counts_monthly
 description: Aggregate count of MAU taking an action related to an issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
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 90bc9ba73d0..3d6bb37de79 100644
--- a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
+++ b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_approve_monthly
 description: Count of MAU using the `/approve` quick action
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
index 0c78cd4faa8..c905cdcfb04 100644
--- a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
+++ b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/assign @user1` quick action to assign a si
   individual to an issuable
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
index fde995ff768..89d0de2550f 100644
--- a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
+++ b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/assign me` quick action to assign self to
   issuable
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
index 9eeb21e4c0b..ef2778050b0 100644
--- a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/assign_reviewer` or `request_reviewer` qui
   action
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
index 6a8564ed981..ac3ca60d777 100644
--- a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
+++ b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/award` quick action to set an award emoji
   an issuable
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
index f92880c38eb..4f35a7dcd33 100644
--- a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_board_move_monthly
 description: Count of MAU using the `/board_move` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
index 10f4e667e25..235d6505438 100644
--- a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_clone_monthly
 description: Count of MAU using the `/clone` quick action to clone an issue.
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
index 7a41293254e..d2ae2e53f38 100644
--- a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
+++ b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_close_monthly
 description: Count of MAU using the `/close` quick action to close an issuable
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
index 3c5bdf3a4a3..9dca99be928 100644
--- a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/confidential` quick action to set an issue
   confidential
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
index 3a9f9f70110..1b8e52b127e 100644
--- a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_merge_req
 description: Count of MAU using the `/copy_metadata` quick action on a Merge Request
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
index e8266a1989e..68d3b37035c 100644
--- a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_issue_mon
 description: Count of MAU using the `/copy_metadata` quick action on an issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
index 5132d880fe8..ddcec1d9a86 100644
--- a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_create_merge_request_mo
 description: Count of MAU using the `/create_merge_request` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
index bd96f6965a0..725e369519d 100644
--- a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
+++ b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_done_monthly
 description: Count of MAU using the `/done` quick action to mark a todo as done
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
index 825d8355a70..77a22a982d4 100644
--- a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_draft_monthly
 description: Count of MAU using the `/draft` quick action on a Merge Request
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
index a8bcaf7b2c9..aea158347d2 100644
--- a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
+++ b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/due` quick action to change the due date o
   an issuable
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
index 41c067dc88c..e79a1b5e869 100644
--- a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/duplicate` quick action to mark an issue a
   a duplicate of another
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
index 96a51c514c7..e59d264fe1d 100644
--- a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/estimate` quick action to set a time estim
   on an issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: time_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
index 3f5fa5396e3..5b34fee13fd 100644
--- a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
+++ b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_label_monthly
 description: Count of MAU using the `/label` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
index 7b65c2cecbb..6c1d4bb8520 100644
--- a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_lock_monthly
 description: Count of MAU using the `/lock` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
index 2b9c653e31e..524a75f84d4 100644
--- a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
+++ b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_merge_monthly
 description: Count of MAU using the `/merge` quick action
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
index dca92829b75..7e373fe2e13 100644
--- a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_milestone_monthly
 description: Count of MAU using the `/milestone` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
index 20bb3e82ce5..88765db809e 100644
--- a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_move_monthly
 description: Count of MAU using the `/move` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
index 06cb49ad587..44d3d677dee 100644
--- a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
+++ b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_reassign_monthly
 description: Count of MAU using the `/reassign @user1` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
index de7bf045dbc..061bcbbb6c0 100644
--- a/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_reassign_reviewer_month
 description: Count of MAU using the `/reassign_reviewer` quick action
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
index 177be7f33b4..ae3b9ae13c2 100644
--- a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
+++ b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_rebase_monthly
 description: Count of MAU using the `/rebase` quick action on a Merge Request
 product_section: dev
 product_stage: source_code
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
index bcbee861e6a..4e3f6f53694 100644
--- a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
+++ b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_relabel_monthly
 description: Count of MAU using the `/relabel` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
index e16251e169a..88b3d2c6c6d 100644
--- a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_relate_monthly
 description: Count of MAU using the `/relate` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
index f573957f5fd..ec0f16a09c2 100644
--- a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
+++ b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_remove_due_date_monthly
 description: Count of MAU using the `/remove_due_date` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
index 8df0eb3ed73..831f9a93982 100644
--- a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_remove_estimate_monthly
 description: Count of MAU using the `/remove_estimate` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: time_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
index 71f51658ba9..aacd8916937 100644
--- a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_remove_milestone_monthl
 description: Count of MAU using the `/remove_milestone` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
index dae709a56f7..13adfd63500 100644
--- a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
+++ b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_remove_time_spent_month
 description: Count of MAU using the `/remove_time_spent` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
index fcc00892045..4e0e679e4d8 100644
--- a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_remove_zoom_monthly
 description: Count of MAU using the `/remove_zoom` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
index 4b9e1af8108..8341b7f0179 100644
--- a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
+++ b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_reopen_monthly
 description: Count of MAU using the `/reopen` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
index fb549d259d4..c711dff2df0 100644
--- a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
+++ b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_shrug_monthly
 description: Count of MAU using the `/shrug` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
index 912ea2487be..7de55598d47 100644
--- a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
+++ b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_spend_subtract_monthly
 description: Count of MAU using the `/spend` quick action to subtract time spent
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: time_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
index d6992675957..99f7aa98719 100644
--- a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
+++ b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_spend_add_monthly
 description: Count of MAU using the `/spend` quick action to add time spent
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
index 5b2272f09e2..1e3fefbcfae 100644
--- a/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_submit_review_monthly
 description: Count of MAU using the `/submit_review` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
index 03be662de07..9eca7c87963 100644
--- a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_subscribe_monthly
 description: Count of MAU using the `/subscribe` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
index b7a9bb1b669..5280ed2fcbf 100644
--- a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_tableflip_monthly
 description: Count of MAU using the `/tableflip` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
index c48efc45953..15c89bcec88 100644
--- a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
+++ b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_tag_monthly
 description: Count of MAU using the `/tag` quick action
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
index 372220ae58b..21cb0a54942 100644
--- a/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
+++ b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_target_branch_monthly
 description: Count of MAU using the `/target_branch` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
index 76004594d85..82168bfe6ca 100644
--- a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_title_monthly
 description: Count of MAU using the `/title` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
index 05353f9c3bc..78a05e1003c 100644
--- a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_todo_monthly
 description: Count of MAU using the `/todo` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
index 095e11f90dd..df49d1b427c 100644
--- a/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_unassign_specific_month
 description: Count of MAU using the `/unassign @user1` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
index 54ed00ab80a..426ab3bf763 100644
--- a/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_unassign_all_monthly
 description: Count of MAU using the `/unassign` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
index f9132b9d641..5cb2e620dc1 100644
--- a/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/unassign_reviewer` or `/remove_reviewer` q
   action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
index 38c44348a4c..00aa10d9578 100644
--- a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/unlabel` or `/remove_label` quick action t
   remove one or more specific labels
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
index ce3d14e8906..97e40c5a1b1 100644
--- a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_all_monthly
 description: Count of MAU using the `/unlabel` quick action to remove all labels
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
index 0f9c059409c..29c61e97726 100644
--- a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_unlock_monthly
 description: Count of MAU using the `/unlock` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
index 585370e1fa2..879a60fc8e7 100644
--- a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_unsubscribe_monthly
 description: Count of MAU using the `/unsubscribe` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
index fed595813ca..fcdc2e28030 100644
--- a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_wip_monthly
 description: Count of MAU using the `/wip` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
index d6b8bb2b366..5c346f40ebc 100644
--- a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_zoom_monthly
 description: Count of MAU using the `/zoom` quick action on Issues
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181923_successful_deployments.yml b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
index 675a7972ddc..27881c0975a 100644
--- a/config/metrics/counts_28d/20210216181923_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
@@ -4,7 +4,7 @@ key_path: counts_monthly.successful_deployments
 description: Total successful deployments
 product_section: ops
 product_stage: release
-product_group: group::release
+product_group: release
 product_category: continuous_delivery
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181924_failed_deployments.yml b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
index b173c4dd125..1cd1a8a032a 100644
--- a/config/metrics/counts_28d/20210216181924_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
@@ -4,7 +4,7 @@ key_path: counts_monthly.failed_deployments
 description: Total failed deployments
 product_section: ops
 product_stage: release
-product_group: group::release
+product_group: release
 product_category: continuous_delivery
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181935_deployments.yml b/config/metrics/counts_28d/20210216181935_deployments.yml
index a8c2928caeb..5e7ee9b1d50 100644
--- a/config/metrics/counts_28d/20210216181935_deployments.yml
+++ b/config/metrics/counts_28d/20210216181935_deployments.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.release.deployments
 description: Unique users triggering deployments
 product_section: ops
 product_stage: release
-product_group: group::release
+product_group: release
 product_category: continuous_delivery
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181937_failed_deployments.yml b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
index 00967fc519c..adf373cde20 100644
--- a/config/metrics/counts_28d/20210216181937_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.release.failed_deployments
 description: Disinct users who initiated a failed deployment.
 product_section: ops
 product_stage: release
-product_group: group::release
+product_group: release
 product_category: continuous_delivery
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181939_releases.yml b/config/metrics/counts_28d/20210216181939_releases.yml
index ea59a5be99f..a2a5a4adb0b 100644
--- a/config/metrics/counts_28d/20210216181939_releases.yml
+++ b/config/metrics/counts_28d/20210216181939_releases.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.release.releases
 description: Unique users creating release tags
 product_section: ops
 product_stage: release
-product_group: group::release
+product_group: release
 product_category: continuous_delivery
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181941_successful_deployments.yml b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
index cc176feb5d3..a2282df3e4f 100644
--- a/config/metrics/counts_28d/20210216181941_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.release.successful_deployments
 description: Disinct users who initiated a successful deployment.
 product_section: ops
 product_stage: release
-product_group: group::release
+product_group: release
 product_category: continuous_delivery
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
index eebce0dcb81..9752c924a90 100644
--- a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
+++ b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.verify.clusters_applications_runner
 description: Total GitLab Managed clusters with Runner enabled
 product_section: ops
 product_stage: verify
-product_group: group::runner
+product_group: runner
 product_category: runner
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216182034_deploy_keys.yml b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
index 77902b38f6d..22e30fd46cd 100644
--- a/config/metrics/counts_28d/20210216182034_deploy_keys.yml
+++ b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.create.deploy_keys
 description: Count of users creating deploy keys in last 28 days.
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216182036_keys.yml b/config/metrics/counts_28d/20210216182036_keys.yml
index 63df27fe2e7..32debdcde5c 100644
--- a/config/metrics/counts_28d/20210216182036_keys.yml
+++ b/config/metrics/counts_28d/20210216182036_keys.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.create.keys
 description: Count of users creating regular keys in last 28 days.
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
index 888a25194b2..49a8bd129c4 100644
--- a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
+++ b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
@@ -5,7 +5,7 @@ description: Count of users creating projects with remote mirrors. Includes both
   and pull mirrors.
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
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 e8d8ad16a08..3db7aec4eab 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
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_pro
 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
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
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 28b03586bb8..eaad616dbb5 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
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_git
 description: Aggregated value for wiki, design, and project repo Git write actions
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216182051_protected_branches.yml b/config/metrics/counts_28d/20210216182051_protected_branches.yml
index 3718bef319c..30a3fdec69a 100644
--- a/config/metrics/counts_28d/20210216182051_protected_branches.yml
+++ b/config/metrics/counts_28d/20210216182051_protected_branches.yml
@@ -5,7 +5,7 @@ description: Count of users creating projects with repositories making use of at
   one protected branch in last 28 days.
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
index 490c2260902..09aa1254bf7 100644
--- a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.source_code.wiki_action_monthly
 description: Count of unique actions done on a wiki (create, edit, delete)
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
index 28807011aa2..41157cef2fe 100644
--- a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.source_code.design_action_monthly
 description: Count of total design actions (upload, delete, comment, reply)
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
index 4ef38c412a5..d6fc28af969 100644
--- a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique actions done on projects and related resources (cre
   edit, delete, comment)
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216182129_sast_pipeline.yml b/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
index 2fd7a4bf683..53f1d30f870 100644
--- a/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
+++ b/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.secure.sast_pipeline
 description: Counts of Pipelines that have at least 1 SAST job
 product_section: sec
 product_stage: secure
-product_group: group::static analysis
+product_group: static_analysis
 product_category: static_application_security_testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml b/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
index 1690987c446..fee63f8d9fd 100644
--- a/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
+++ b/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.secure.secret_detection_pipeline
 description: Counts of Pipelines that have at least 1 Secret Detection job
 product_section: sec
 product_stage: secure
-product_group: group::static analysis
+product_group: static_analysis
 product_category: secret_detection
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
index ad5bba69a67..12b9e922a1c 100644
--- a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
+++ b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
@@ -5,7 +5,7 @@ description: Internal Tracking to count number of unit tests parsed for planning
   future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
 product_section: ops
 product_stage: verify
-product_group: group::pipeline insights
+product_group: pipeline_insights
 product_category: code_testing
 value_type: number
 status: active
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 45f136efb76..37c12a1e9be 100644
--- a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
+++ b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
@@ -4,7 +4,7 @@ key_path: counts_monthly.projects_with_alerts_created
 description: Monthly count of unique projects with HTTP alerting enabled
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: metrics
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
index 8ea92369e0b..d617f3dcebd 100644
--- a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
+++ b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: counts_monthly.aggregated_metrics.product_analytics_test_metrics_union
 description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
+product_section: analytics
+product_stage: analytics
+product_group: product_intelligence
 product_category: collection
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
index 1e3913056e1..b5c1114ddbb 100644
--- a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
+++ b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: counts_monthly.aggregated_metrics.product_analytics_test_metrics_intersection
 description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
+product_section: analytics
+product_stage: analytics
+product_group: product_intelligence
 product_category: collection
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
index 4240abf9aa9..b65141906e8 100644
--- a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
+++ b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.omniauth_providers
 description: List of unique OmniAuth providers
 product_section: dev
 product_stage: manage
-product_group: group::authentication and authorization
+product_group: authentication_and_authorization
 product_category: authentication_and_authorization
 value_type: object
 status: active
diff --git a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
index 95c4946756c..4e6bb25cb13 100644
--- a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
+++ b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.unique_users_all_imports
 description: Number of unique users performing imports
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183640_gitlab.yml b/config/metrics/counts_28d/20210216183640_gitlab.yml
index 9fc8a81d95f..2c29feff047 100644
--- a/config/metrics/counts_28d/20210216183640_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183640_gitlab.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.bulk_imports.gitlab
 description: REMOVED - Count of projects imported using bulk imports
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
index aa1eae2e0c0..6deb3c937b2 100644
--- a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
+++ b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.bulk_imports.gitlab_v1
 description: Count of bulk imports - GitLab Migration
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183644_gitlab_project.yml b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
index c74e5c56a8d..0b776822fcc 100644
--- a/config/metrics/counts_28d/20210216183644_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab_project
 description: Count of projects imported using Project Import/Export
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183646_gitlab.yml b/config/metrics/counts_28d/20210216183646_gitlab.yml
index 511f9cd279c..73b7ae42466 100644
--- a/config/metrics/counts_28d/20210216183646_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183646_gitlab.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab
 description: Count of projects imported from GitLab using Project Export/Import
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183648_github.yml b/config/metrics/counts_28d/20210216183648_github.yml
index 0894998c7c4..159f0440bb8 100644
--- a/config/metrics/counts_28d/20210216183648_github.yml
+++ b/config/metrics/counts_28d/20210216183648_github.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.project_imports.github
 description: Count of projects imported from GitHub
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183650_bitbucket.yml b/config/metrics/counts_28d/20210216183650_bitbucket.yml
index 2f205a8995a..3ad9a26367e 100644
--- a/config/metrics/counts_28d/20210216183650_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183650_bitbucket.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.project_imports.bitbucket
 description: Count of projects imported from Bitbucket
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
index 7f470f7955f..87c88931a7c 100644
--- a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.project_imports.bitbucket_serve
 description: Count of projects imported from Bitbucket Server
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183653_gitea.yml b/config/metrics/counts_28d/20210216183653_gitea.yml
index 37e3ed2bf43..f23380e1726 100644
--- a/config/metrics/counts_28d/20210216183653_gitea.yml
+++ b/config/metrics/counts_28d/20210216183653_gitea.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.project_imports.gitea
 description: Count of projects imported from Gitea
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183655_git.yml b/config/metrics/counts_28d/20210216183655_git.yml
index daf8875ad12..e886cf6132b 100644
--- a/config/metrics/counts_28d/20210216183655_git.yml
+++ b/config/metrics/counts_28d/20210216183655_git.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.project_imports.git
 description: Count of projects imported from Git
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183657_manifest.yml b/config/metrics/counts_28d/20210216183657_manifest.yml
index d597be585f3..316755c772f 100644
--- a/config/metrics/counts_28d/20210216183657_manifest.yml
+++ b/config/metrics/counts_28d/20210216183657_manifest.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.project_imports.manifest
 description: Count of projects imported using Manifest file
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
index 68d5d3604a0..413ccf6d2c0 100644
--- a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab_migratio
 description: Count of projects imported using GitLab Migration
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183701_jira.yml b/config/metrics/counts_28d/20210216183701_jira.yml
index b171deb35f0..dc7c6c925f2 100644
--- a/config/metrics/counts_28d/20210216183701_jira.yml
+++ b/config/metrics/counts_28d/20210216183701_jira.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.issue_imports.jira
 description: Count of imports from Jira
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183703_fogbugz.yml b/config/metrics/counts_28d/20210216183703_fogbugz.yml
index e3286c11f2a..44acc1f7fdb 100644
--- a/config/metrics/counts_28d/20210216183703_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183703_fogbugz.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.issue_imports.fogbugz
 description: Count of imports from Fogbugz
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183705_phabricator.yml b/config/metrics/counts_28d/20210216183705_phabricator.yml
index 942f5e9dabc..69ea2a20a69 100644
--- a/config/metrics/counts_28d/20210216183705_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183705_phabricator.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.issue_imports.phabricator
 description: Count of imports from Phabricator
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183707_csv.yml b/config/metrics/counts_28d/20210216183707_csv.yml
index a43bc380daa..5fd80dfd9a3 100644
--- a/config/metrics/counts_28d/20210216183707_csv.yml
+++ b/config/metrics/counts_28d/20210216183707_csv.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.issue_imports.csv
 description: Count of (issue) imports from CSV file
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183709_group_import.yml b/config/metrics/counts_28d/20210216183709_group_import.yml
index 7485b5a0b4a..03ad489c40c 100644
--- a/config/metrics/counts_28d/20210216183709_group_import.yml
+++ b/config/metrics/counts_28d/20210216183709_group_import.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.group_imports.group_import
 description: Number of group import states
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
index 4c80d88c922..8e44c933e6e 100644
--- a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.group_imports.gitlab_migration
 description: Count of groups imported using GitLab Migration
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183712_total.yml b/config/metrics/counts_28d/20210216183712_total.yml
index 7d20907a88c..0c97b73c81a 100644
--- a/config/metrics/counts_28d/20210216183712_total.yml
+++ b/config/metrics/counts_28d/20210216183712_total.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.projects_imported.total
 description: Count of all imported projects
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183714_gitlab_project.yml b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
index 11397036533..9257e00455c 100644
--- a/config/metrics/counts_28d/20210216183714_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.projects_imported.gitlab_projec
 description: Count of projects imported using Project Import/Export
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183716_gitlab.yml b/config/metrics/counts_28d/20210216183716_gitlab.yml
index 1f7a233360a..0b9b9163ef1 100644
--- a/config/metrics/counts_28d/20210216183716_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183716_gitlab.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.projects_imported.gitlab
 description: Count of projects imported using Project Import/Export
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183718_github.yml b/config/metrics/counts_28d/20210216183718_github.yml
index d3686ee5f13..b25a9b9266f 100644
--- a/config/metrics/counts_28d/20210216183718_github.yml
+++ b/config/metrics/counts_28d/20210216183718_github.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.projects_imported.github
 description: Count of projects imported from GitHub
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183720_bitbucket.yml b/config/metrics/counts_28d/20210216183720_bitbucket.yml
index 281ddbc4179..7ae5c83bc6c 100644
--- a/config/metrics/counts_28d/20210216183720_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183720_bitbucket.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.projects_imported.bitbucket
 description: Count of projects imported from Bitbucket
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
index bdff1803a6a..dee0bcf6600 100644
--- a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.projects_imported.bitbucket_ser
 description: Count of projects imported from Bitbucket Server
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183724_gitea.yml b/config/metrics/counts_28d/20210216183724_gitea.yml
index eecbd276e0c..cdb61b51634 100644
--- a/config/metrics/counts_28d/20210216183724_gitea.yml
+++ b/config/metrics/counts_28d/20210216183724_gitea.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.projects_imported.gitea
 description: Count of projects imported from Gitea
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183726_git.yml b/config/metrics/counts_28d/20210216183726_git.yml
index e9b7a0d5e76..91e6a29d6fe 100644
--- a/config/metrics/counts_28d/20210216183726_git.yml
+++ b/config/metrics/counts_28d/20210216183726_git.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.projects_imported.git
 description: Count of projects imported from Git
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183728_manifest.yml b/config/metrics/counts_28d/20210216183728_manifest.yml
index 8cf5bb94cef..470aee68e76 100644
--- a/config/metrics/counts_28d/20210216183728_manifest.yml
+++ b/config/metrics/counts_28d/20210216183728_manifest.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.projects_imported.manifest
 description: Count of projects imported from Git using file Manifest
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183730_jira.yml b/config/metrics/counts_28d/20210216183730_jira.yml
index 094e46ba7f6..04d2f7f19ad 100644
--- a/config/metrics/counts_28d/20210216183730_jira.yml
+++ b/config/metrics/counts_28d/20210216183730_jira.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.issues_imported.jira
 description: Count of projects imported from Jira
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183731_fogbugz.yml b/config/metrics/counts_28d/20210216183731_fogbugz.yml
index 678d57b894e..a11a386f014 100644
--- a/config/metrics/counts_28d/20210216183731_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183731_fogbugz.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.issues_imported.fogbugz
 description: Count of projects imported from Fogbugz
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183733_phabricator.yml b/config/metrics/counts_28d/20210216183733_phabricator.yml
index 0f3b9cc46ee..4237650388a 100644
--- a/config/metrics/counts_28d/20210216183733_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183733_phabricator.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.issues_imported.phabricator
 description: Count of projects imported from Phabricator
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183735_csv.yml b/config/metrics/counts_28d/20210216183735_csv.yml
index e81cc094832..4bceff8d3f6 100644
--- a/config/metrics/counts_28d/20210216183735_csv.yml
+++ b/config/metrics/counts_28d/20210216183735_csv.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.issues_imported.csv
 description: Count of projects imported from CSV file
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183737_groups_imported.yml b/config/metrics/counts_28d/20210216183737_groups_imported.yml
index 3c62a859573..643b5010c09 100644
--- a/config/metrics/counts_28d/20210216183737_groups_imported.yml
+++ b/config/metrics/counts_28d/20210216183737_groups_imported.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.groups_imported
 description: Count of imported groups
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category: importers
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
index b4e45462f71..7901b72ea4b 100644
--- a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
@@ -7,7 +7,7 @@ description: Total unique users for i_search_total, i_search_advanced, i_search_
   just want the total
 product_section: enablement
 product_stage: enablement
-product_group: group::global search
+product_group: global_search
 product_category: global_search
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
index e4c831091da..4225932b14b 100644
--- a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
+++ b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ide_edit.g_edit_by_sse_monthly
 description: Number of user editing files using the Static Site Editor
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: static_site_editor
 value_type: number
 status: removed
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 ed703302451..d3dcfa28f58 100644
--- a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.source_code.git_write_action_monthly
 description: Count of unique Git write actions
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
index fc007008b87..9c8ce1a1f06 100644
--- a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: redis_hll_counters.testing.testing_total_unique_counts_monthly
 description: Total users for events under testing category
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
+product_section: analytics
+product_stage: analytics
+product_group: product_intelligence
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
index 70fc51b3d43..ffa7e442f40 100644
--- a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
+++ b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.snippets.i_snippets_show_monthly
 description: Monthly number of users viewing snippets
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: snippets
 value_type: number
 status: active
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 4f6aeb09d70..382c98ccbe2 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.terraform.p_terraform_state_api_unique_users_monthl
 description: Monthly active users of GitLab Managed Terraform states
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: infrastructure_as_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
index 19e4aa14577..bbdead7be2e 100644
--- a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
+++ b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
@@ -5,7 +5,7 @@ description: Monthly unique user count doing commits which contains the CI confi
   file
 product_section: ops
 product_stage: verify
-product_group: group::pipeline authoring
+product_group: pipeline_authoring
 product_category: pipeline_authoring
 value_type: number
 status: active
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 495c7740e3f..f3b794bcc95 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
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_toggled_task_item_status_monthly
 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_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 e3e7aa10c95..7968c4cbba5 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
@@ -3,7 +3,7 @@ data_category: operational
 key_path: redis_hll_counters.code_review.i_code_review_user_approve_mr_monthly
 description: Count of unique users per month who approve a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 94ac6d7b6b7..60a38d6fa8e 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
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_unapprove_mr_monthly
 description: Count of unique users per month who unapprove a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 5cd9131d663..e58f002071a 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
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_resolve_thread_monthly
 description: Count of unique users per month who resolve a thread in a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 01ab33527cc..d19a8a9d711 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
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_unresolve_thread_monthly
 description: Count of unique users per month who unresolve a thread in a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 e09ac66953f..526a0da2dd8 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
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_edit_mr_title_monthly
 description: Count of unique users per month who edit the title of a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 99bddd4591b..1df6ec58528 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
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_edit_mr_desc_monthly
 description: Count of unique users per month who edit the description of a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 9626907c904..144b0c4cd6a 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_create_review_note_m
 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_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 1153c89126e..33e9f1a2e66 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_publish_review_month
 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_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 805914598d6..0d487ff783e 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_create_multiline_mr_
 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_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 84fa938126f..b430d20b4c5 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_edit_multiline_mr_co
 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_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 db2155a71fe..eaf0244a307 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_remove_multiline_mr_
 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_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 da36f141a43..b53f211203c 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
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_assigned_monthly
 description: Count of unique users per month who are assigned to a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 4afb00c81dd..df3b27dae2e 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
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_marked_as_draft_monthly
 description: Count of unique users per month who mark a merge request as a draft
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 c104c010002..8257411194d 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
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_unmarked_as_draft_monthly
 description: Count of unique users per month who unmark a merge request as a draft
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 d65c8380bc9..e3c41d33dfc 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
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_review_requested_monthly
 description: Count of unique users per month who request a review of a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 0da9ce57fea..475623aaa65 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
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_added_monthly
 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_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 d2be31f7e89..23795ffbead 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_delete
 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_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 2c1fc6664ff..aa60572f00a 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_edited
 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_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 fec6640220f..3a94b3062e0 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
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_vs_code_api_request_monthly
 description: Count of unique users per month who use GitLab Workflow for VS Code
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: editor_extension
 product_section: 'TBD'
 value_type: number
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 27c161cf13c..a4133bbef1f 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
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_from_issue_monthly
 description: Count of unique users per month who create a merge request from an issue
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 f41722f99cc..f2e72cb8fff 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
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.code_review_total_unique_counts_monthly
 description: Count of unique users per month who interact with a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
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 09590b677f6..43a8a2340eb 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_mo
 description: Count of pipelines with implicit Auto DevOps runs
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: infrastructure_as_code
 value_type: number
 status: active
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 407768232a5..0143fa01995 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_bu
 description: Count of pipelines with implicit Auto Build runs
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: infrastructure_as_code
 value_type: number
 status: removed
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 291ee7eb149..ee1c9ff1694 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_de
 description: Count of pipelines with implicit Auto Deploy runs
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: infrastructure_as_code
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml b/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
index 822b436dfdd..a26887fef7d 100644
--- a/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_sast_
 description: Count of pipelines with implicit SAST runs
 product_section: ops
 product_stage: verify
-product_group: "group::static analysis"
+product_group: "static_analysis"
 product_category: SAST
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml b/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
index 57831d3a9dc..9e97dbe0bf2 100644
--- a/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_secre
 description: Count of pipelines with implicit Secret Detection runs
 product_section: ops
 product_stage: verify
-product_group: "group::static analysis"
+product_group: "static_analysis"
 product_category: secret_detection
 value_type: number
 status: active
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 155994cb6f8..6fd6f8eb080 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_mo
 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_group: 5-min-app
 product_category: five_minute_production_app
 value_type: number
 status: removed
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 6ca23b2d634..ac40f896b35 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_monthly
 description: Count of pipelines using the Auto DevOps template
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: infrastructure_as_code
 value_type: number
 status: active
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 7d3462cb068..6da5d7822d2 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
@@ -5,7 +5,7 @@ description: Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.
   template in last 28 days.
 product_section: ops
 product_stage: release
-product_group: group::release
+product_group: release
 product_category: continuous_delivery
 value_type: number
 status: removed
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 0645894329a..0ad5b9a9a5c 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
@@ -5,7 +5,7 @@ description: Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in
   28 days.
 product_section: ops
 product_stage: release
-product_group: group::release
+product_group: release
 product_category: continuous_delivery
 value_type: number
 status: active
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 5b95b20f38d..a5e5b1239d4 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_build_month
 description: Count of pipelines using the Auto Build template
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: infrastructure_as_code
 value_type: number
 status: removed
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 6747c81367c..affc895a9ed 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_mont
 description: Count of pipelines using the stable Auto Deploy template
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: infrastructure_as_code
 value_type: number
 status: removed
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 9efd5df6104..d1f300d4ab5 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_late
 description: Count of pipelines using the latest Auto Deploy template
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: infrastructure_as_code
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml b/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
index 6c838d74576..2d8d1f10866 100644
--- a/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_security_sast_monthly
 description: Count of pipelines with SAST runs
 product_section: ops
 product_stage: verify
-product_group: "group::static analysis"
+product_group: "static_analysis"
 product_category: SAST
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml b/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
index cda8ebf1550..b8114ecb647 100644
--- a/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_security_secret_detecti
 description: Count of pipelines with Secret Detection runs
 product_section: ops
 product_stage: verify
-product_group: "group::static analysis"
+product_group: "static_analysis"
 product_category: secret_detection
 value_type: number
 status: active
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 1831c8827f3..9774fc3a35e 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_base_latest_m
 description: Count of pipelines that include the terraform base template from GitLab
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: infrastructure_as_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
index df70ef7c718..a2a97eb7477 100755
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.ci_templates_total_unique_counts_month
 description: Total count of pipelines runs
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: infrastructure_as_code
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
index 23f3d923576..c5e686a5353 100644
--- a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.quickactions_total_unique_counts_month
 description: Count of MAU using one or more quick actions
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
index 9f4cfe0fc13..1f68d5e5af8 100644
--- a/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
@@ -5,7 +5,7 @@ description: A monthly count of Composer packages published to the registry usin
   a deploy token
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
index 89a54558bd7..7f412de4467 100644
--- a/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
@@ -5,7 +5,7 @@ description: A monthly count of Conan packages published to the registry using a
   token
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
index 3ddc5ee355a..d664a9fec80 100644
--- a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
@@ -5,7 +5,7 @@ description: A monthly count of container images published to the registry using
   deploy token
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
index 3de1fc2c0e8..20dbc97c7e8 100644
--- a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
@@ -5,7 +5,7 @@ description: A monthly count of Debian packages published to the registry using
   deploy token
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
index a09e973206d..fb60d6165ba 100644
--- a/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
@@ -5,7 +5,7 @@ description: A monthly count of generic packages published to the registry using
   deploy token
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
index c11dead0b06..e4c289fc23f 100644
--- a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
@@ -5,7 +5,7 @@ description: A monthly count of Go modules published to the registry using a dep
   token
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
index c6e71e4a61b..5451a18cc82 100644
--- a/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
@@ -5,7 +5,7 @@ description: A monthly count of Maven packages published to the registry using a
   token
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
index 143a840761c..123df5707f8 100644
--- a/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
@@ -5,7 +5,7 @@ description: A monthly count of npm packages published to the registry using a d
   token
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
index cb7c6ae2e5b..b9f87e33fa9 100644
--- a/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
@@ -5,7 +5,7 @@ description: A monthly count of NuGet packages published to the registry using a
   token
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
index cadeb269204..05e80915b60 100644
--- a/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
@@ -5,7 +5,7 @@ description: A monthly count of PyPI packages published to the registry using a
   token
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
index bb6dd458ca6..a1409e87db2 100644
--- a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
@@ -5,7 +5,7 @@ description: A monthly count of package tags published to the registry using a d
   token
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
index 344f35fa353..720165425fa 100644
--- a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
@@ -5,7 +5,7 @@ description: A monthly count of packages published to the registry using a deplo
   token
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml b/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
index f9baba603e9..f0fc010c722 100644
--- a/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
@@ -5,7 +5,7 @@ description: A monthly count of users that have published a Composer package to
   registry
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml b/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
index 8a50ea78fe2..7388ed8860b 100644
--- a/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_conan_user_monthly
 description: A monthly count of users that have published a Conan package to the registry
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
index 0e018dcd1a2..5c7f1b30f44 100644
--- a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
@@ -5,7 +5,7 @@ description: A monthly count of users that have published a container image to t
   registry
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
index 03e9ec5f665..f6a96c326c9 100644
--- a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
@@ -5,7 +5,7 @@ description: A monthly count of users that have published a Debian package to th
   registry
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
index 93f551178c3..cce0c3d6a65 100644
--- a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
@@ -5,7 +5,7 @@ description: A monthly count of users that have published a generic package to t
   registry
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
index 5f135e00214..b6df3cb30f2 100644
--- a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_golang_user_monthly
 description: A monthly count of users that have published a Go moduleto the registry
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml b/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
index 3fdb957ef0d..d591e6ec5da 100644
--- a/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_maven_user_monthly
 description: A monthly count of users that have published a Maven package to the registry
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml b/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
index f945fbf5266..e9992148893 100644
--- a/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_npm_user_monthly
 description: A monthly count of users that have published an npm package to the registry
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml b/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
index 782e7788eb2..0a77f2de550 100644
--- a/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_nuget_user_monthly
 description: A monthly count of users that have published a NuGet package to the registry
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml b/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
index d86147526e0..6cc9645516a 100644
--- a/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_pypi_user_monthly
 description: A monthly count of users that have published a PyPI package to the registry
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
index 4912d7fd40d..9fc86ae712c 100644
--- a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_tag_user_monthly
 description: A monthly count of users that have published a package tag to the registry
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
index 98679813670..52e2eec71c5 100644
--- a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.user_packages_total_unique_counts_mon
 description: A monthly count of users that have published a package to the registry
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml b/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
index 7c4a4c8b032..bb919257a57 100644
--- a/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_close_issue_mont
 description: Number of users closing Jira issues by month
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml b/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
index 2e41282a9cf..efd75c178b3 100644
--- a/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
+++ b/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_cross_reference_
 description: Number of users that cross-referenced Jira issues by month
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
index 1c89217829c..2d9e5402ffa 100644
--- a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.ecosystem_total_unique_counts_monthly
 description: Number of users for Jira and Slack by month
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml b/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
index 660f3675359..ae717f7cc1e 100644
--- a/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
+++ b/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_invite_email_single_mon
 description: Unique users using the /invite_email quick action to add a single email participant to an issue within 28 days
 product_section: dev
 product_stage: plan
-product_group: group::product planning
+product_group: product_planning
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml b/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
index 034eda07221..ce22e3ad675 100644
--- a/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
+++ b/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_invite_email_multiple_m
 description: Unique users using the /invite_email quick action to add a multiple email participants to an issue within 28 days
 product_section: dev
 product_stage: plan
-product_group: group::product planning
+product_group: product_planning
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
index 2a7484f710a..c8d329a777b 100644
--- a/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_time_estimate_change
 description: Count of unique users per month who changed time estimate of a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
index febb6ea8464..aee5fb45c10 100644
--- a/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_time_spent_changed_m
 description: Count of unique users per month who changed time spent on a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml b/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
index d5b943fbed4..9cc58cc7963 100644
--- a/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_mr_discussion_locked
 description: Count of unique users per month who locked a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml b/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
index 022047e7d0e..9474d1c8253 100644
--- a/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_mr_discussion_unlock
 description: Count of unique users per month who unlocked a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
index 41e0d1c4a4d..25f6292cae0 100644
--- a/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
+++ b/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_user
 description: Monthly unique user count having merge requests which contains the CI config file
 product_section: ops
 product_stage: verify
-product_group: group::pipeline authoring
+product_group: pipeline_authoring
 product_category: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
index 6fc1b724468..2e23791ef95 100644
--- a/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_milestone_changed_mo
 description: Count of unique users per month who changed milestone of a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml b/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
index 644a09ffc23..d93dd8e64a8 100644
--- a/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_labels_changed_month
 description: Count of unique users per month who changed labels of a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml b/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
index a72f0675c6f..e42d744b718 100644
--- a/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_assignees_changed_mo
 description: Count of unique users per month who changed assignees of a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml b/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
index 679cef614ef..9bbee5ed9b6 100644
--- a/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_reviewers_changed_mo
 description: Count of unique users per month who changed reviewers of a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml b/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
index 5bee115d9d3..d668067c0ff 100644
--- a/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_issue_notificat
 description: Calculated unique users to trigger a Slack message by performing an action on an issue by month
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml b/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
index 3860335ef8e..f342e358301 100644
--- a/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_push_notificati
 description: Calculated unique users to trigger a Slack message by performing a Git push by month
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml b/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
index 69b0bcb7181..daa96258a11 100644
--- a/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_deployment_noti
 description: Calculated unique users to trigger a Slack message by performing a deployment by month
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml b/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
index 3a2d77b811a..d8852ab90bd 100644
--- a/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_wiki_page_notif
 description: Calculated unique users to trigger a Slack message by performing an action on a wiki page by month
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml b/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
index e9f1ad972f7..9b485c7c39d 100644
--- a/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_merge_request_n
 description: Calculated unique users to trigger a Slack message by performing an action on a merge request by month
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml b/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
index d30874198d0..f407a19aab3 100644
--- a/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_note_notificati
 description: Calculated unique users to trigger a Slack message by creating a note by month
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml b/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
index 3f58d21ae15..f815f161859 100644
--- a/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_tag_push_notifi
 description: Calculated unique users to trigger a Slack message by performing a tag push by month
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml b/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
index 516b1385474..b8485c38da2 100644
--- a/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_confidential_no
 description: Calculated unique users to trigger a Slack message by creating a confidential note by month
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml b/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
index e959116a4fa..023bf9955b9 100644
--- a/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_confidential_is
 description: Calculated unique users to trigger a Slack message by performing an action on a confidential issue by month
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml b/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
index 07fd63aacec..6ca11514b09 100644
--- a/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.deploy_token_packages.i_package_rubygems_deploy_tok
 description: Distinct count events for RubyGems packages published using a Deploy token in recent 28 days
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package_registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml b/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
index e7ecbddda51..2d5eda05a7f 100644
--- a/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
+++ b/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_rubygems_user_monthly
 description: Distinct user count of RubyGems packages published in recent 28 days
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package_registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
index 5a2d55f35a0..dfaff8de054 100644
--- a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.secure.users_expanding_secure_security_report_month
 description: Count of expanding the security report widget
 product_section: sec
 product_stage: secure
-product_group: group::static analysis
+product_group: static_analysis
 product_category: dependency_scanning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
index 7d8b1753990..65b9764cf10 100644
--- a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.users_expanding_testing_code_quality_report
 description: Count of expanding the code quality widget
 product_section: ops
 product_stage: verify
-product_group: group::pipeline insights
+product_group: pipeline_insights
 product_category: code_quality
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
index d0c8c0404fb..601fc6fdab3 100644
--- a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.users_expanding_testing_accessibility_repor
 description: Count of expanding the accessibility report widget
 product_section: ops
 product_stage: verify
-product_group: group::pipeline insights
+product_group: pipeline_insights
 product_category: accessibility_testing
 value_type: number
 status: active
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
index d55ba9c7937..64daea732c5 100644
--- 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.deploy_token_packages.i_package_terraform_module_de
 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_group: configure
 product_category: infrastructure_as_code
 value_type: number
 status: active
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
index 58700643680..070a0669d54 100644
--- 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_terraform_module_user_month
 description: Number of distinct users creating Terraform Module packages in recent 28 days
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: infrastructure_as_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
index 1edc5ce21df..49cab313fc8 100644
--- a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
+++ b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.i_testing_summary_widget_total_monthly
 description: Unique users that expand the test summary merge request widget by month
 product_section: ops
 product_stage: verify
-product_group: group::pipeline insights
+product_group: pipeline_insights
 product_category: testing
 value_type: number
 status: active
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
index da9bc2493a7..5557480f8fb 100644
--- 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_click_single_file_mode_se
 description: Count of users clicking single file mode setting
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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
index 5a4cf3692ae..e8e988a4523 100644
--- 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_click_file_browser_settin
 description: Count of users clicking merge request file browser setting
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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
index a378c9eb07f..483923397b5 100644
--- 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_click_whitespace_setting_
 description: Count of users clicking merge request whitespae setting
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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
index 3d271e3b38f..bc628468e30 100644
--- 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
@@ -4,7 +4,7 @@ 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_group: code_review
 product_category: code_review
 value_type: number
 status: active
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
index 0e2f0430a38..f1c431574f9 100644
--- 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_diff_view_parallel_monthl
 description: Count of users with merge request view type as parallel
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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
index 1bbf3a04418..75f0169692a 100644
--- 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_file_browser_tree_view_mo
 description: Count of users with merge request file tree setting
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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
index 8aeb80499ae..ccd333ba13a 100644
--- 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_file_browser_list_view_mo
 description: Count of users with merge request file list setting
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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
index 306eeddc25b..23dae4618b1 100644
--- 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_diff_show_whitespace_mont
 description: Count of users with show whitespace enabled
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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
index ef8410fdb7b..4a639d02565 100644
--- 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_diff_hide_whitespace_mont
 description: Count of users with show whitespace disabled
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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
index 76fe3b835fa..8ae647ab1de 100644
--- 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
@@ -4,7 +4,7 @@ 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_group: code_review
 product_category: code_review
 value_type: number
 status: active
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
index 9ab2bd2e48a..f4aa1da6498 100644
--- 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_diff_multiple_files_month
 description: Count of users with single mode disabled
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
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
index 67cae705601..f3df451f720 100644
--- 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
@@ -4,7 +4,7 @@ key_path: counts_monthly.aggregated_metrics.code_review_category_monthly_active_
 description: Unique users performing actions on code review events
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category:
 value_type: number
 status: active
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
index b379aa78586..4594539267d 100644
--- 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
@@ -4,7 +4,7 @@ key_path: counts_monthly.aggregated_metrics.code_review_extension_category_month
 description: Number of users performing i_code_review_user_vs_code_api_request event
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category:
 value_type: number
 status: active
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
index 01c4724971d..939e8d69063 100644
--- 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
@@ -4,7 +4,7 @@ key_path: counts_monthly.aggregated_metrics.code_review_group_monthly_active_use
 description: Number of users performing at least one of the code review events
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category:
 value_type: number
 status: active
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
index b37c149ec11..a3f1a052531 100644
--- 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.pipeline_authoring.pipeline_authoring_total_unique_
 description: Unique users doing commits or push MRs which contains CI cifig file
 product_section: ops
 product_stage: verify
-product_group: group::pipeline authoring
+product_group: pipeline_authoring
 product_category: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml b/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
index c854fe7e34d..f08a7bfd4d6 100644
--- a/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
+++ b/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_resolve_conflict_mon
 name: resolve_conflict
 description: Count of unique users per week who attempt to resolve a conflict through the ui
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml b/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
index 49500d88646..b8dc238e59f 100644
--- a/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
+++ b/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_load_conflict_ui_mon
 name: load_conflict_ui
 description: Count of unique users per week who load the conflict resolution page
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
index 7b39c8a3996..9a6bf373cbe 100644
--- a/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
+++ b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
@@ -4,7 +4,7 @@ key_path: counts_monthly.projects
 description: 'Count number of projects created monthly'
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: ''
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml b/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
index e891843a68d..c0fd95f4be2 100644
--- a/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.deploy_token_packages.i_package_helm_deploy_token_m
 description: Distinct Helm pakages deployed in recent 28 days
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package_registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml b/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
index 3653e1d2b2f..0e32bf86f68 100644
--- a/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
+++ b/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_helm_user_monthly
 description: Distinct user count events for Helm packages in recent 28 days
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: package_registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210520111133_total.yml b/config/metrics/counts_28d/20210520111133_total.yml
index cef2766c95a..1a7437259f6 100644
--- a/config/metrics/counts_28d/20210520111133_total.yml
+++ b/config/metrics/counts_28d/20210520111133_total.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.project_imports.total
 description: Total count of projects imported
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml b/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
index 35dfad5b7a8..28425f5f1cd 100644
--- a/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_click_diff_view_setting_m
 description: Count of users clicking diff view setting
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml b/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml
index d5656bcc80b..0efb03c9fe9 100644
--- a/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml
+++ b/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml
@@ -4,7 +4,7 @@ description: Unique users creating releases with milestones associated
 performance_indicator_type: []
 product_section: ops
 product_stage: release
-product_group: 'group::release'
+product_group: 'release'
 product_category: Release Orchestration
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml b/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml
index 3414cf0e868..106ab05f6d5 100644
--- a/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml
+++ b/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_searches_diff_monthl
 description: Count of users who search merge request diffs
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml b/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
index a2af908ea49..eedece821d0 100644
--- a/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
+++ b/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_severity_monthly
 description: Count of MAU using the `/severity` quick action
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: incident_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml b/config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml
index a5bd56d0a7d..19bd4f54e5c 100644
--- a/config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml
+++ b/config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml
@@ -4,7 +4,7 @@ name: "count_notes_with_suggestions_monthly"
 description: Total number of monthly suggestions
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml b/config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml
index 2d4f41f6dff..97550aee80e 100644
--- a/config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml
+++ b/config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml
@@ -4,7 +4,7 @@ name: "count_notes_with_applied_suggestions_monthly"
 description: Total number of monthly suggestions applied
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210902191057_i_quickactions_unapprove_monthly.yml b/config/metrics/counts_28d/20210902191057_i_quickactions_unapprove_monthly.yml
index 6cd2704b058..8611f03604e 100644
--- a/config/metrics/counts_28d/20210902191057_i_quickactions_unapprove_monthly.yml
+++ b/config/metrics/counts_28d/20210902191057_i_quickactions_unapprove_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_unapprove_monthly
 description: Count of MAU using the `/unapprove` quick action
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210908150458_i_code_review_user_resolve_thread_in_issue_monthly.yml b/config/metrics/counts_28d/20210908150458_i_code_review_user_resolve_thread_in_issue_monthly.yml
index 072305ed6f4..5c2327fd50b 100644
--- a/config/metrics/counts_28d/20210908150458_i_code_review_user_resolve_thread_in_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210908150458_i_code_review_user_resolve_thread_in_issue_monthly.yml
@@ -4,7 +4,7 @@ name: resolve_thread_in_issue
 description: The number of users who resolve a thread in a new issue through the MR page monthly
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
index 65a9a0b3cee..0ee3d694317 100644
--- a/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
+++ b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
@@ -4,7 +4,7 @@ name: count_distinct_users_using_two_factor_authentication
 description: Number of unique user logins using two factor authentication for available providers
 product_section: dev
 product_stage: manage
-product_group: group::authentication and authorization
+product_group: authentication_and_authorization
 product_category: authentication_and_authorization
 value_type: object
 status: active
diff --git a/config/metrics/counts_28d/20210916080405_promoted_issues.yml b/config/metrics/counts_28d/20210916080405_promoted_issues.yml
index 27c9f01edbe..5c1ad6446f0 100644
--- a/config/metrics/counts_28d/20210916080405_promoted_issues.yml
+++ b/config/metrics/counts_28d/20210916080405_promoted_issues.yml
@@ -2,9 +2,9 @@
 key_path: counts_monthly.promoted_issues
 name: count_promoted_issues
 description: Count of issues promoted to epics
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
+product_section: analytics
+product_stage: analytics
+product_group: product_intelligence
 product_category: collection
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml b/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml
index 6ecc98dcad1..1d3b7907c13 100644
--- a/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml
+++ b/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.monitor.clusters_integrations_promethe
 description: Users creating clusters with Prometheus integration enabled in last 28 days.
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: metrics
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml b/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml
index d79dede39f0..baa0b529d26 100644
--- a/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml
+++ b/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.importer.github_import_project_start_monthly
 description: The number of github projects that were enqueued to start monthy
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml b/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml
index eb4ce81997f..ca943ecad7f 100644
--- a/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml
+++ b/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.importer.github_import_project_success_monthly
 description: The number of github projects that were successful monthly
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml b/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml
index 0f16cf65ca5..fe97d6c0eeb 100644
--- a/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml
+++ b/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.importer.github_import_project_failure_monthly
 description: The number of github projects that failed monthly
 product_section: dev
 product_stage: manage
-product_group: group::import
+product_group: import
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211015154445_p_ci_templates_kaniko_monthly.yml b/config/metrics/counts_28d/20211015154445_p_ci_templates_kaniko_monthly.yml
index 1278c880072..eb03acc2476 100644
--- a/config/metrics/counts_28d/20211015154445_p_ci_templates_kaniko_monthly.yml
+++ b/config/metrics/counts_28d/20211015154445_p_ci_templates_kaniko_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_kaniko_monthly
 description: ''
 product_section: ops
 product_stage: verify
-product_group: group::pipeline authoring
+product_group: pipeline_authoring
 product_category: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211102141250_i_quickactions_promote_to_incident_monthly.yml b/config/metrics/counts_28d/20211102141250_i_quickactions_promote_to_incident_monthly.yml
index 76f24633869..e50780d378f 100644
--- a/config/metrics/counts_28d/20211102141250_i_quickactions_promote_to_incident_monthly.yml
+++ b/config/metrics/counts_28d/20211102141250_i_quickactions_promote_to_incident_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_promote_to_incident_mon
 description: Count of MAU using the `/promote_to_incident` quick action
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: incident_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml
index c9589f3ff29..5f171c62bab 100644
--- a/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_security_sast_iac_lates
 description: Count of pipelines using the latest SAST IaC template
 product_section: sec
 product_stage: secure
-product_group: "group::static analysis"
+product_group: "static_analysis"
 product_category: SAST
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml
index 9e5724b1e40..72a061f831b 100644
--- a/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_sast_
 description: Count of pipelines with implicit runs using the latest SAST IaC template
 product_section: sec
 product_stage: secure
-product_group: "group::static analysis"
+product_group: "static_analysis"
 product_category: SAST
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml
index 40aa9cdbab1..90f8eae91fe 100644
--- a/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_iac_latest_mo
 description: Count of pipelines using the latest SAST IaC template
 product_section: sec
 product_stage: secure
-product_group: "group::static analysis"
+product_group: "static_analysis"
 product_category: SAST
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml
index 3fa3c751366..2a34553de79 100644
--- a/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_sast_iac_
 description: Count of pipelines with implicit runs using the latest SAST IaC template
 product_section: sec
 product_stage: secure
-product_group: "group::static analysis"
+product_group: "static_analysis"
 product_category: SAST
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml b/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml
index 928dd24b701..d20b78cab9b 100644
--- a/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml
+++ b/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.code_review.i_code_review_widget_nothing_merge_clic
 description: Count of users who click the create file button in the nothing to merge widget state
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml b/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml
index ce6ab2f1580..f00f7cfafb9 100644
--- a/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml
+++ b/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_add_contacts_monthly
 description: Count of MAU using the `/add_contacts` quick action
 product_section: dev
 product_stage: plan
-product_group: group::product planning
+product_group: product_planning
 product_category: service_desk
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml b/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml
index 7a544890e5a..cdf2b6abf39 100644
--- a/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml
+++ b/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_remove_contacts_monthly
 description: Count of MAU using the `/remove_contacts` quick action
 product_section: dev
 product_stage: plan
-product_group: group::product planning
+product_group: product_planning
 product_category: service_desk
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211111162103_i_code_review_post_merge_delete_branch_monthly.yml b/config/metrics/counts_28d/20211111162103_i_code_review_post_merge_delete_branch_monthly.yml
index 8bdad9d6837..c944a82a373 100644
--- a/config/metrics/counts_28d/20211111162103_i_code_review_post_merge_delete_branch_monthly.yml
+++ b/config/metrics/counts_28d/20211111162103_i_code_review_post_merge_delete_branch_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.code_review.i_code_review_post_merge_delete_branch_
 description: Count of users who click the delete source branch button after merge
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211111162422_i_code_review_post_merge_click_revert_monthly.yml b/config/metrics/counts_28d/20211111162422_i_code_review_post_merge_click_revert_monthly.yml
index aac7e359887..b01a6fe58f5 100644
--- a/config/metrics/counts_28d/20211111162422_i_code_review_post_merge_click_revert_monthly.yml
+++ b/config/metrics/counts_28d/20211111162422_i_code_review_post_merge_click_revert_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.code_review.i_code_review_post_merge_click_revert_m
 description: Count of users who click the revert button in the merge requet widget
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211112102446_i_code_review_post_merge_click_cherry_pick_monthly.yml b/config/metrics/counts_28d/20211112102446_i_code_review_post_merge_click_cherry_pick_monthly.yml
index cb0eb0e9b34..40f5cac914c 100644
--- a/config/metrics/counts_28d/20211112102446_i_code_review_post_merge_click_cherry_pick_monthly.yml
+++ b/config/metrics/counts_28d/20211112102446_i_code_review_post_merge_click_cherry_pick_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.code_review.i_code_review_post_merge_click_cherry_p
 description: Count of users who click the cherry pick button in the merge requet widget
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211112114333_i_code_review_post_merge_submit_revert_modal_monthly.yml b/config/metrics/counts_28d/20211112114333_i_code_review_post_merge_submit_revert_modal_monthly.yml
index 8e20f87ee29..592f51e2e99 100644
--- a/config/metrics/counts_28d/20211112114333_i_code_review_post_merge_submit_revert_modal_monthly.yml
+++ b/config/metrics/counts_28d/20211112114333_i_code_review_post_merge_submit_revert_modal_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.code_review.i_code_review_post_merge_submit_revert_
 description: Count of users who submit the post merge revert modal
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211112115144_i_code_review_post_merge_submit_cherry_pick_modal_monthly.yml b/config/metrics/counts_28d/20211112115144_i_code_review_post_merge_submit_cherry_pick_modal_monthly.yml
index e1492156507..15d1bc80bb2 100644
--- a/config/metrics/counts_28d/20211112115144_i_code_review_post_merge_submit_cherry_pick_modal_monthly.yml
+++ b/config/metrics/counts_28d/20211112115144_i_code_review_post_merge_submit_cherry_pick_modal_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.code_review.i_code_review_post_merge_submit_cherry_
 description: Count of users who submit the post merge revert modal
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml b/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
index bd1e7a74b46..c10bc664168 100644
--- a/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.analytics.p_analytics_ci_cd_pipelines_monthly
 description: Count of unique visits to the project level CI CD Analytics pipelines tab
 product_section: dev
 product_stage: manage
-product_group: group::optimize
+product_group: optimize
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml b/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
index 9a829f0b172..8cf5acd5b0c 100644
--- a/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
+++ b/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.analytics.p_analytics_ci_cd_deployment_frequency_mo
 description: Count of unique visits to the project level CI CD Analytics deployment frequency tab
 product_section: dev
 product_stage: manage
-product_group: group::optimize
+product_group: optimize
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml b/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
index b053926a87a..60dcee1d757 100644
--- a/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
+++ b/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.analytics.p_analytics_ci_cd_lead_time_monthly
 description: Count of unique visits to the project level CI CD Analytics lead time tab
 product_section: dev
 product_stage: manage
-product_group: group::optimize
+product_group: optimize
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml b/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml
index 75e9fb02788..c353641bd6f 100644
--- a/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml
+++ b/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.users_expanding_testing_license_compliance_
 description: Count of expanding the license compliance widget
 product_section: sec
 product_stage: secure
-product_group: group::static analysis
+product_group: static_analysis
 product_category: dependency_scanning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml b/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml
index 96e1bc1f949..1f84c9f1788 100644
--- a/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml
+++ b/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.users_visiting_testing_license_compliance_f
 description: Count of visiting the license compliance full report
 product_section: sec
 product_stage: secure
-product_group: group::static analysis
+product_group: static_analysis
 product_category: dependency_scanning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml b/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml
index dc4bc631759..a8fcd038e84 100644
--- a/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml
+++ b/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.users_visiting_testing_manage_license_compl
 description: Count of visiting the manage license compliance page
 product_section: sec
 product_stage: secure
-product_group: group::static analysis
+product_group: static_analysis
 product_category: dependency_scanning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml b/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml
index 99b64d7a379..cd9132bbcfc 100644
--- a/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml
+++ b/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.users_clicking_license_testing_visiting_ext
 description: Count of users clicking licence to visit external information website
 product_section: sec
 product_stage: secure
-product_group: group::static analysis
+product_group: static_analysis
 product_category: dependency_scanning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220121140644_user_jetbrains_api_request_monthly.yml b/config/metrics/counts_28d/20220121140644_user_jetbrains_api_request_monthly.yml
index deae309753a..2ca245c3c68 100644
--- a/config/metrics/counts_28d/20220121140644_user_jetbrains_api_request_monthly.yml
+++ b/config/metrics/counts_28d/20220121140644_user_jetbrains_api_request_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_jetbrains_api_reques
 description: Count of unique users per month who use GitLab plugin for JetBrains
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: editor_extension
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220131143209_i_quickactions_attention_monthly.yml b/config/metrics/counts_28d/20220131143209_i_quickactions_attention_monthly.yml
index a7ae893ebe9..f3fa80b4f25 100644
--- a/config/metrics/counts_28d/20220131143209_i_quickactions_attention_monthly.yml
+++ b/config/metrics/counts_28d/20220131143209_i_quickactions_attention_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_attention_monthly
 description: Count of MAU using the `/attention` quick action
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220131153230_i_quickactions_remove_attention_monthly.yml b/config/metrics/counts_28d/20220131153230_i_quickactions_remove_attention_monthly.yml
index 3f6fe27c6e4..773fc5564bb 100644
--- a/config/metrics/counts_28d/20220131153230_i_quickactions_remove_attention_monthly.yml
+++ b/config/metrics/counts_28d/20220131153230_i_quickactions_remove_attention_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_remove_attention_monthl
 description: Count of MAU using the `/remove_attention` quick action
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml b/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml
index d33dd895022..ddc6907ee19 100644
--- a/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml
+++ b/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_users.ci_users_executing_deployment_job_monthly
 description: Monthly counts of times users have executed deployment jobs
 product_section: ops
 product_stage: release
-product_group: group::release
+product_group: release
 product_category: continuous_delivery
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml b/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml
index 734bf674f00..cf711de79a9 100644
--- a/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml
+++ b/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml
@@ -4,7 +4,7 @@ description: Unique users updating a work item's title
 product_category: team planning
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 value_type: number
 status: active
 milestone: '14.9'
diff --git a/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml b/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml
index 30cd65425fe..82130118e43 100644
--- a/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml
+++ b/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml
@@ -4,7 +4,7 @@ description: Unique users creating work items
 product_category: team planning
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 value_type: number
 status: active
 milestone: '14.9'
diff --git a/config/metrics/counts_28d/20220222215951_xmau_plan.yml b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
index bab5f66eecd..aaa9558d5a6 100644
--- a/config/metrics/counts_28d/20220222215951_xmau_plan.yml
+++ b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
@@ -4,7 +4,7 @@ description: Unique users interacting with Plan features
 product_category: team planning
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 value_type: number
 status: active
 milestone: '14.9'
diff --git a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
index 0f970f2a344..ede46c85292 100644
--- a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
+++ b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
@@ -4,7 +4,7 @@ description: Unique users interacting with Project Management features
 product_category: team planning
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 value_type: number
 status: active
 milestone: '14.9'
diff --git a/config/metrics/counts_28d/20220222215955_users_work_items.yml b/config/metrics/counts_28d/20220222215955_users_work_items.yml
index a0111383f1d..a0f892fcef2 100644
--- a/config/metrics/counts_28d/20220222215955_users_work_items.yml
+++ b/config/metrics/counts_28d/20220222215955_users_work_items.yml
@@ -4,7 +4,7 @@ description: Unique users interacting with work items
 product_category: team planning
 product_section: dev
 product_stage: plan
-product_group: group::product planning
+product_group: product_planning
 value_type: number
 status: active
 milestone: '14.9'
diff --git a/config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml b/config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml
index 260bae1061f..219147def08 100644
--- a/config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_latest_monthl
 description: Weekly counts for SAST CI Latest template (Jobs folder)
 product_section: sec
 product_stage: secure
-product_group: group::static analysis
+product_group: static_analysis
 product_category: static_application_security_testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml b/config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml
index 163fc9c9ad6..c0d4ba01f03 100644
--- a/config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_secret_detection_l
 description: Weekly counts for Secret Detection CI Latest template (Security folder)
 product_section: sec
 product_stage: secure
-product_group: group::static analysis
+product_group: static_analysis
 product_category: static_application_security_testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml b/config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml
index 2d3ca5386f7..d627a61d553 100644
--- a/config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_secret_de
 description: Weekly counts for implicit use of Secret Detection CI Latest template (Jobs folder)
 product_section: sec
 product_stage: secure
-product_group: group::static analysis
+product_group: static_analysis
 product_category: static_application_security_testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml b/config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml
index 72d37ffb037..a9902f76feb 100644
--- a/config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_sast_late
 description: Weekly counts for implicit use of SAST CI Latest template (Jobs folder)
 product_section: sec
 product_stage: secure
-product_group: group::static analysis
+product_group: static_analysis
 product_category: static_application_security_testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220322194931_users_gitlab_cli_api_request_monthly.yml b/config/metrics/counts_28d/20220322194931_users_gitlab_cli_api_request_monthly.yml
index 2d534efba1c..1496e9dd5e5 100644
--- a/config/metrics/counts_28d/20220322194931_users_gitlab_cli_api_request_monthly.yml
+++ b/config/metrics/counts_28d/20220322194931_users_gitlab_cli_api_request_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_gitlab_cli_api_reque
 description: Count of unique users per month who use the GitLab CLI
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: editor_extension
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220428154012_live_preview.yml b/config/metrics/counts_28d/20220428154012_live_preview.yml
index 8d2954cb825..23bfd9334bc 100644
--- a/config/metrics/counts_28d/20220428154012_live_preview.yml
+++ b/config/metrics/counts_28d/20220428154012_live_preview.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_liv
 description: Count of monthly unique users that successfully connect to Live Preview
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: web_ide
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml b/config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml
index b14d684b908..ddde77a1755 100644
--- a/config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml
+++ b/config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_iac_monthly
 description: Count of pipelines using the stable SAST IaC template
 product_section: sec
 product_stage: secure
-product_group: "group::static analysis"
+product_group: "static_analysis"
 product_category: SAST
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml b/config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml
index 0925312f33a..7b817928c59 100644
--- a/config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml
+++ b/config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_security_sast_iac_month
 description: Count of pipelines using the stable SAST IaC template
 product_section: sec
 product_stage: secure
-product_group: "group::static analysis"
+product_group: "static_analysis"
 product_category: SAST
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml b/config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml
index 658db1a27af..a4042763c46 100644
--- a/config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml
@@ -5,11 +5,12 @@ description: Users that have a last_activity_on date within the past 28 days
 product_category:
 product_section: dev
 product_stage: manage
-product_group: group::manage
+product_group: manage
 value_type: number
-status: active
+status: removed
 milestone: "15.1"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88631
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88631/
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90468/
 time_frame: 28d
 data_source: database
 data_category: optional
diff --git a/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml
index 1c70507da36..9f7a78cefdf 100644
--- a/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml
@@ -4,7 +4,7 @@ name: count_unique_users_interacting_with_timeline_events_monthly
 description: Counts unique users for timeline events create, edit and delete events per month
 product_section: ops
 product_stage: monitor
-product_group: group::respond
+product_group: respond
 product_category: incident_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220621085114_unique_active_users_monthly.yml b/config/metrics/counts_28d/20220621085114_unique_active_users_monthly.yml
new file mode 100644
index 00000000000..3282a4db173
--- /dev/null
+++ b/config/metrics/counts_28d/20220621085114_unique_active_users_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.manage.unique_active_users_monthly
+description: Users that have a last_activity_on date within the past 28 days
+product_section: dev
+product_stage: manage
+product_group: manage
+value_type: number
+status: active
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90468/
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - unique_active_user
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220622084700_p_analytics_ci_cd_time_to_restore_service_monthly.yml b/config/metrics/counts_28d/20220622084700_p_analytics_ci_cd_time_to_restore_service_monthly.yml
new file mode 100644
index 00000000000..a9a62b1aa79
--- /dev/null
+++ b/config/metrics/counts_28d/20220622084700_p_analytics_ci_cd_time_to_restore_service_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.analytics.p_analytics_ci_cd_time_to_restore_service_monthly
+name: p_analytics_ci_cd_time_to_restore_service_monthly
+description: Count of unique visits to the project level CI/CD Analytics Time to restore service tab
+product_section: dev
+product_stage: manage
+product_group: optimize
+product_category:
+value_type: number
+status: active
+milestone: "15.2"
+introduced_by_url:
+time_frame: 28d
+data_source: redis_hll
+data_category: operational
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- premium
+- ultimate
+options:
+  events:
+    - p_analytics_ci_cd_time_to_restore_service
diff --git a/config/metrics/counts_28d/20220706175117_ci_users_executing_verify_job_monthly.yml b/config/metrics/counts_28d/20220706175117_ci_users_executing_verify_job_monthly.yml
new file mode 100644
index 00000000000..7abc7b63c84
--- /dev/null
+++ b/config/metrics/counts_28d/20220706175117_ci_users_executing_verify_job_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_users.ci_users_executing_verify_environment_job_monthly
+description: Monthly counts of times users have executed verify jobs
+product_section: ops
+product_stage: release
+product_group: release
+product_category: continuous_delivery
+value_type: number
+status: active
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91925
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - ci_users_executing_verify_environment_job
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20220707054530_p_analytics_ci_cd_change_failure_rate_monthly.yml b/config/metrics/counts_28d/20220707054530_p_analytics_ci_cd_change_failure_rate_monthly.yml
new file mode 100644
index 00000000000..186011b35af
--- /dev/null
+++ b/config/metrics/counts_28d/20220707054530_p_analytics_ci_cd_change_failure_rate_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.analytics.p_analytics_ci_cd_change_failure_rate_monthly
+name: p_analytics_ci_cd_change_failure_rate_monthly
+description: Count of unique visits to the project level CI/CD Analytics Change failure rate tab
+product_section: dev
+product_stage: manage
+product_group: optimize
+product_category:
+value_type: number
+status: active
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91726
+time_frame: 28d
+data_source: redis_hll
+data_category: operational
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- premium
+- ultimate
+options:
+  events:
+    - p_analytics_ci_cd_change_failure_rate