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

1552 files changed, 2982 insertions, 2119 deletions

diff --git a/config/application.rb b/config/application.rb
index ad76a6d8e7e..b758f2df857 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -20,6 +20,8 @@ module Gitlab
 
     config.view_component.preview_route = "/-/view_component/previews"
 
+    config.active_support.hash_digest_class = ::OpenSSL::Digest::SHA256
+
     # This section contains configuration from Rails upgrades to override the new defaults so that we
     # keep existing behavior.
     #
@@ -38,7 +40,6 @@ module Gitlab
     # Rails 5.2
     config.action_dispatch.use_authenticated_cookie_encryption = false
     config.active_support.use_authenticated_message_encryption = false
-    config.active_support.hash_digest_class = ::Digest::MD5 # New default is ::Digest::SHA1
     config.action_controller.default_protect_from_forgery = false
     config.action_view.form_with_generates_ids = false
 
@@ -303,6 +304,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/terms.css"
     config.assets.precompile << "page_bundles/todos.css"
     config.assets.precompile << "page_bundles/wiki.css"
+    config.assets.precompile << "page_bundles/work_items.css"
     config.assets.precompile << "page_bundles/xterm.css"
     config.assets.precompile << "lazy_bundles/cropper.css"
     config.assets.precompile << "lazy_bundles/select2.css"
@@ -404,6 +406,16 @@ module Gitlab
         end
       end
 
+      # Cross-origin requests must be enabled to fetch the self-managed application oauth application ID
+      # for the GitLab for Jira app.
+      allow do
+        origins '*'
+        resource '/-/jira_connect/oauth_application_id',
+          headers: :any,
+          methods: %i(get options),
+          credentials: false
+      end
+
       # These are routes from doorkeeper-openid_connect:
       # https://github.com/doorkeeper-gem/doorkeeper-openid_connect#routes
       allow do
@@ -492,19 +504,6 @@ module Gitlab
       end
     end
 
-    # We know Rails closes database connections in the
-    # active_record.clear_active_connections initializer, so only log database
-    # connections opened after that.
-    initializer :start_logging_new_postgresql_connections, after: :finisher_hook do
-      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.warn_on_new_connection = true
-    end
-
-    # It is legitimate to open database connections after initializers so stop
-    # logging
-    initializer :stop_logging_new_postgresql_connections, after: :set_routes_reloader_hook do
-      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.warn_on_new_connection = false
-    end
-
     # Add assets for variants of GitLab. They should take precedence over CE.
     # This means if multiple files exist, e.g.:
     #
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 076957f3057..5b72c6b35f8 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -37,6 +37,9 @@ Rails.application.configure do
   # Expands the lines which load the assets
   # config.assets.debug = true
 
+  # Annotate rendered view with template file names as HTML comments
+  config.action_view.annotate_rendered_view_with_filenames = true
+
   # Adds additional error checking when serving assets at runtime.
   # Checks for improperly declared sprockets dependencies.
   # Raises helpful error messages.
@@ -66,6 +69,7 @@ Rails.application.configure do
     config.active_record.migration_error = false
     config.active_record.verbose_query_logs = false
     config.action_view.cache_template_loading = true
+    config.action_view.annotate_rendered_view_with_filenames = false
 
     config.middleware.delete BetterErrors::Middleware
   end
diff --git a/config/events/1655179428_design_actions_create_.yml b/config/events/1655179428_design_actions_create_.yml
new file mode 100644
index 00000000000..25e03a08a7a
--- /dev/null
+++ b/config/events/1655179428_design_actions_create_.yml
@@ -0,0 +1,25 @@
+---
+description: Triggered from backend layer when design is created
+category: design_actions
+action: create
+label_description: Constant string that match with ServicePing metric name of action_monthly_active_users_design_management
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: group::product_planning
+product_category: design_management
+milestone: "15.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90107
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/1655179485_design_actions_update_.yml b/config/events/1655179485_design_actions_update_.yml
new file mode 100644
index 00000000000..7648e51f0ae
--- /dev/null
+++ b/config/events/1655179485_design_actions_update_.yml
@@ -0,0 +1,25 @@
+---
+description: Triggered from backend layer when design is updated
+category: design_actions
+action: update
+label_description: Constant string that match with ServicePing metric name of action_monthly_active_users_design_management
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: group::product_planning
+product_category: design_management
+milestone: "15.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90107
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/1655179517_design_actions_destroy_.yml b/config/events/1655179517_design_actions_destroy_.yml
new file mode 100644
index 00000000000..fd75f698e5e
--- /dev/null
+++ b/config/events/1655179517_design_actions_destroy_.yml
@@ -0,0 +1,25 @@
+---
+description: Triggered from backend layer when design is deleted
+category: design_actions
+action: destroy
+label_description: Constant string that match with ServicePing metric name of action_monthly_active_users_design_management
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: group::product_planning
+product_category: design_management
+milestone: "15.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90107
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/1655281022_i_search_total.yml b/config/events/1655281022_i_search_total.yml
new file mode 100644
index 00000000000..1fe8432fff0
--- /dev/null
+++ b/config/events/1655281022_i_search_total.yml
@@ -0,0 +1,25 @@
+---
+description: Triggered from backend layer Search controller performs search operation
+category: SearchController
+action: i_search_total
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+  - project
+  - user
+  - namespace
+product_section: enablement
+product_stage: enablement
+product_group: group::global search
+product_category: global_search
+milestone: "15.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90224
+distributions:
+  - ce
+  - ee
+tiers:
+  - free
+  - premium
+  - ultimate
diff --git a/config/events/1655726589_ide_edit_g_edit_by_web_ide.yml b/config/events/1655726589_ide_edit_g_edit_by_web_ide.yml
new file mode 100644
index 00000000000..128bfaf6029
--- /dev/null
+++ b/config/events/1655726589_ide_edit_g_edit_by_web_ide.yml
@@ -0,0 +1,22 @@
+---
+description: Triggered from backend on editing file in web ide
+category: ide_edit
+action: g_edit_by_web_ide
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category: web_ide
+milestone: "15.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90484
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/1655726622_ide_edit_g_edit_by_live_preview.yml b/config/events/1655726622_ide_edit_g_edit_by_live_preview.yml
new file mode 100644
index 00000000000..d9d54e1c311
--- /dev/null
+++ b/config/events/1655726622_ide_edit_g_edit_by_live_preview.yml
@@ -0,0 +1,22 @@
+---
+description: Triggered from backend on showing a file in live preview
+category: ide_edit
+action: g_edit_by_live_preview
+identifiers:
+  - project
+  - user
+  - namespace
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category: web_ide
+milestone: "15.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90484
+distributions:
+  - ce
+  - ee
+tiers:
+  - free
+  - premium
+  - ultimate
+
diff --git a/config/events/1655726650_ide_edit_g_edit_by_sfe.yml b/config/events/1655726650_ide_edit_g_edit_by_sfe.yml
new file mode 100644
index 00000000000..9acdc317cf5
--- /dev/null
+++ b/config/events/1655726650_ide_edit_g_edit_by_sfe.yml
@@ -0,0 +1,22 @@
+---
+description: Triggered from backend on editing file by sfe
+category: ide_edit
+action: g_edit_by_sfe
+identifiers:
+  - project
+  - user
+  - namespace
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category: web_ide
+milestone: "15.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90484
+distributions:
+  - ce
+  - ee
+tiers:
+  - free
+  - premium
+  - ultimate
+
diff --git a/config/events/1655726683_ide_edit_g_edit_by_snippet_ide.yml b/config/events/1655726683_ide_edit_g_edit_by_snippet_ide.yml
new file mode 100644
index 00000000000..2b3ed1a5d7a
--- /dev/null
+++ b/config/events/1655726683_ide_edit_g_edit_by_snippet_ide.yml
@@ -0,0 +1,22 @@
+---
+description: Triggered from backend on editing file by ide snippet
+category: ide_edit
+action: g_edit_by_snippet_ide
+identifiers:
+  - project
+  - user
+  - namespace
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category: web_ide
+milestone: "15.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90484
+distributions:
+  - ce
+  - ee
+tiers:
+  - free
+  - premium
+  - ultimate
+
diff --git a/config/events/1655841083_projects_settings_cicd_show_render.yml b/config/events/1655841083_projects_settings_cicd_show_render.yml
new file mode 100644
index 00000000000..45f0037443b
--- /dev/null
+++ b/config/events/1655841083_projects_settings_cicd_show_render.yml
@@ -0,0 +1,26 @@
+---
+description: Load Project-level Secure Files list in CI/CD settings
+category: projects:settings:ci_cd:show
+action: render
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+  - project
+  - user
+  - namespace
+product_section: ops
+product_stage: verify
+product_group: group::pipeline_authoring
+product_category: secrets_management
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90449
+distributions:
+  - ce
+  - ee
+tiers: 
+  - free
+  - premium
+  - ultimate
+
diff --git a/config/events/1655841352_projects_settings_cicd_show_upload.yml b/config/events/1655841352_projects_settings_cicd_show_upload.yml
new file mode 100644
index 00000000000..a19462d671e
--- /dev/null
+++ b/config/events/1655841352_projects_settings_cicd_show_upload.yml
@@ -0,0 +1,25 @@
+---
+description: Upload a Project-level Secure Files in the CI/CD settings page
+category: projects:settings:ci_cd:show
+action: upload
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+  - project
+  - user
+  - namespace
+product_section: ops
+product_stage: verify
+product_group: group::pipeline_authoring
+product_category: secrets_management
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90449
+distributions:
+  - ce
+  - ee
+tiers: 
+  - free
+  - premium
+  - ultimate
diff --git a/config/events/1655841364_projects_settings_cicd_show_delete.yml b/config/events/1655841364_projects_settings_cicd_show_delete.yml
new file mode 100644
index 00000000000..c106ab376e3
--- /dev/null
+++ b/config/events/1655841364_projects_settings_cicd_show_delete.yml
@@ -0,0 +1,25 @@
+---
+description: Delete a Project-level Secure Files via the CI/CD settings page
+category: projects:settings:ci_cd:show
+action: delete
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+  - project
+  - user
+  - namespace
+product_section: ops
+product_stage: verify
+product_group: group::pipeline_authoring
+product_category: secrets_management
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90449
+distributions:
+  - ce
+  - ee
+tiers: 
+  - free
+  - premium
+  - ultimate
diff --git a/config/events/1656510012_merge_requests_i_code_review_user_approve_mr.yml b/config/events/1656510012_merge_requests_i_code_review_user_approve_mr.yml
new file mode 100644
index 00000000000..10ebf12253f
--- /dev/null
+++ b/config/events/1656510012_merge_requests_i_code_review_user_approve_mr.yml
@@ -0,0 +1,26 @@
+---
+description: Merge request approvals
+category: merge_requests
+action: i_code_review_user_approve_mr
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: 'TBD'
+product_stage: create
+product_group: code_review
+product_category: code_review
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91493
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/1656554755_issues_edit_g_project_management_issue_added_to_epic.yml b/config/events/1656554755_issues_edit_g_project_management_issue_added_to_epic.yml
new file mode 100644
index 00000000000..0c1ea4584e1
--- /dev/null
+++ b/config/events/1656554755_issues_edit_g_project_management_issue_added_to_epic.yml
@@ -0,0 +1,20 @@
+---
+description: Issue was added to an epic
+category: issues_edit
+action: g_project_management_issue_added_to_epic
+identifiers:
+  - project
+  - user
+  - namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+product_category: issue_tracking
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91443
+distributions:
+  - ee
+tiers:
+  - premium
+  - ultimate
+
diff --git a/config/events/1656555050_issues_edit_g_project_management_issue_changed_epic.yml b/config/events/1656555050_issues_edit_g_project_management_issue_changed_epic.yml
new file mode 100644
index 00000000000..b74054b4eb5
--- /dev/null
+++ b/config/events/1656555050_issues_edit_g_project_management_issue_changed_epic.yml
@@ -0,0 +1,20 @@
+---
+description: Epic was changed on an issue
+category: issues_edit
+action: g_project_management_issue_changed_epic
+identifiers:
+  - project
+  - user
+  - namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+product_category: issue_tracking
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91443
+distributions:
+  - ee
+tiers:
+  - premium
+  - ultimate
+
diff --git a/config/events/1656555163_issues_edit_g_project_management_issue_health_status_changed.yml b/config/events/1656555163_issues_edit_g_project_management_issue_health_status_changed.yml
new file mode 100644
index 00000000000..00a375074f6
--- /dev/null
+++ b/config/events/1656555163_issues_edit_g_project_management_issue_health_status_changed.yml
@@ -0,0 +1,20 @@
+---
+description: Health status was changed on an issue
+category: issues_edit
+action: g_project_management_issue_health_status_changed
+identifiers:
+  - project
+  - user
+  - namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+product_category: issue_tracking
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91443
+distributions:
+  - ee
+tiers:
+  - premium
+  - ultimate
+
diff --git a/config/events/1656555272_issues_edit_g_project_management_issue_iteration_changed.yml b/config/events/1656555272_issues_edit_g_project_management_issue_iteration_changed.yml
new file mode 100644
index 00000000000..7e755c6e0e9
--- /dev/null
+++ b/config/events/1656555272_issues_edit_g_project_management_issue_iteration_changed.yml
@@ -0,0 +1,20 @@
+---
+description: Issue's iteration was changed
+category: issues_edit
+action: g_project_management_issue_iteration_changed
+identifiers:
+  - project
+  - user
+  - namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+product_category: issue_tracking
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91443
+distributions:
+  - ee
+tiers:
+  - premium
+  - ultimate
+
diff --git a/config/events/1656555342_issues_edit_g_project_management_issue_removed_from_epic.yml b/config/events/1656555342_issues_edit_g_project_management_issue_removed_from_epic.yml
new file mode 100644
index 00000000000..5241e48ee9f
--- /dev/null
+++ b/config/events/1656555342_issues_edit_g_project_management_issue_removed_from_epic.yml
@@ -0,0 +1,20 @@
+---
+description: An issue was removed from an epic
+category: issues_edit
+action: g_project_management_issue_removed_from_epic
+identifiers:
+  - project
+  - user
+  - namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+product_category: issue_tracking
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91443
+distributions:
+  - ee
+tiers:
+  - premium
+  - ultimate
+
diff --git a/config/events/1656555426_issues_edit_g_project_management_issue_weight_changed.yml b/config/events/1656555426_issues_edit_g_project_management_issue_weight_changed.yml
new file mode 100644
index 00000000000..99492d50176
--- /dev/null
+++ b/config/events/1656555426_issues_edit_g_project_management_issue_weight_changed.yml
@@ -0,0 +1,20 @@
+---
+description: Issue's weight was changed
+category: issues_edit
+action: g_project_management_issue_weight_changed
+identifiers:
+  - project
+  - user
+  - namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+product_category: issue_tracking
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91443
+distributions:
+  - ee
+tiers:
+  - premium
+  - ultimate
+
diff --git a/config/events/1656690716_post_receive_source_code_pushes.yml b/config/events/1656690716_post_receive_source_code_pushes.yml
new file mode 100644
index 00000000000..d0c9fa35d09
--- /dev/null
+++ b/config/events/1656690716_post_receive_source_code_pushes.yml
@@ -0,0 +1,26 @@
+---
+description: All events of Git push operations
+category: PostReceive
+action: source_code_pushes
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: create
+product_group: source_code
+product_category: source_code_management
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91605
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/feature_flags/development/about_your_company_registration_flow.yml b/config/feature_flags/development/about_your_company_registration_flow.yml
index 424de7a9ba2..63c1e42972a 100644
--- a/config/feature_flags/development/about_your_company_registration_flow.yml
+++ b/config/feature_flags/development/about_your_company_registration_flow.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83345
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355909
 milestone: '14.10'
 type: development
-group: group::adoption
+group: group::acquisition
 default_enabled: false
diff --git a/config/feature_flags/development/access_token_pagination.yml b/config/feature_flags/development/access_token_pagination.yml
new file mode 100644
index 00000000000..df003ed8891
--- /dev/null
+++ b/config/feature_flags/development/access_token_pagination.yml
@@ -0,0 +1,8 @@
+---
+name: access_token_pagination
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91372
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366534
+milestone: '15.2'
+type: development
+group: group::authentication and authorization
+default_enabled: false
diff --git a/config/feature_flags/development/allow_possible_spam.yml b/config/feature_flags/development/allow_possible_spam.yml
index 3f7a084130a..89393c91c43 100644
--- a/config/feature_flags/development/allow_possible_spam.yml
+++ b/config/feature_flags/development/allow_possible_spam.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17604
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/33421
 milestone: '12.4'
 type: development
-group: group::product planning
+group: group::anti-abuse
 default_enabled: false
diff --git a/config/feature_flags/development/approval_rules_pagination.yml b/config/feature_flags/development/approval_rules_pagination.yml
new file mode 100644
index 00000000000..494109e3f5a
--- /dev/null
+++ b/config/feature_flags/development/approval_rules_pagination.yml
@@ -0,0 +1,8 @@
+---
+name: approval_rules_pagination
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91702
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366823
+milestone: '15.2'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/auto_ban_user_on_excessive_projects_download.yml b/config/feature_flags/development/auto_ban_user_on_excessive_projects_download.yml
new file mode 100644
index 00000000000..d3883086088
--- /dev/null
+++ b/config/feature_flags/development/auto_ban_user_on_excessive_projects_download.yml
@@ -0,0 +1,8 @@
+---
+name: auto_ban_user_on_excessive_projects_download
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87872
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364782
+milestone: '15.2'
+type: development
+group: group::anti-abuse
+default_enabled: false
diff --git a/config/feature_flags/development/batch_load_environment_last_deployment_group.yml b/config/feature_flags/development/batch_load_environment_last_deployment_group.yml
index d6de45eacdf..4d35b638fbc 100644
--- a/config/feature_flags/development/batch_load_environment_last_deployment_group.yml
+++ b/config/feature_flags/development/batch_load_environment_last_deployment_group.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363023
 milestone: '15.1'
 type: development
 group: group::release
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/blame_page_pagination.yml b/config/feature_flags/development/blame_page_pagination.yml
index 49fb1a7f605..8465b40b4c5 100644
--- a/config/feature_flags/development/blame_page_pagination.yml
+++ b/config/feature_flags/development/blame_page_pagination.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360927
 milestone: '15.0'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/monitor_tracing.yml b/config/feature_flags/development/cache_pages_domain_api.yml
index e4de215cc97..409497aa22d 100644
--- a/config/feature_flags/development/monitor_tracing.yml
+++ b/config/feature_flags/development/cache_pages_domain_api.yml
@@ -1,8 +1,8 @@
 ---
-name: monitor_tracing
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85877
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/359904
-milestone: '15.0'
+name: cache_pages_domain_api
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88956
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364127
+milestone: '15.2'
 type: development
-group: group::respond
+group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/cache_unleash_client_api.yml b/config/feature_flags/development/cache_unleash_client_api.yml
new file mode 100644
index 00000000000..dcaa9c323c4
--- /dev/null
+++ b/config/feature_flags/development/cache_unleash_client_api.yml
@@ -0,0 +1,8 @@
+---
+name: cache_unleash_client_api
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90490
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365575
+milestone: '15.2'
+type: development
+group: group::release
+default_enabled: false
diff --git a/config/feature_flags/development/change_response_code_merge_status.yml b/config/feature_flags/development/change_response_code_merge_status.yml
index 89092fe4164..9f102d70354 100644
--- a/config/feature_flags/development/change_response_code_merge_status.yml
+++ b/config/feature_flags/development/change_response_code_merge_status.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356930
 milestone: '15.1'
 type: development
 group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_docker_image_pull_policy.yml b/config/feature_flags/development/ci_docker_image_pull_policy.yml
index 09e01fb5232..5bdcdf03d27 100644
--- a/config/feature_flags/development/ci_docker_image_pull_policy.yml
+++ b/config/feature_flags/development/ci_docker_image_pull_policy.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363186
 milestone: '15.1'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/trigger_job_retry_action.yml b/config/feature_flags/development/ci_increase_includes_to_250.yml
index 79a8593fd05..b6291ab0cd3 100644
--- a/config/feature_flags/development/trigger_job_retry_action.yml
+++ b/config/feature_flags/development/ci_increase_includes_to_250.yml
@@ -1,8 +1,8 @@
 ---
-name: trigger_job_retry_action
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77951
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349966
-milestone: '14.7'
+name: ci_increase_includes_to_250
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64934
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344449
+milestone: '15.2'
 type: development
 group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/infinitely_collapsible_sections.yml b/config/feature_flags/development/ci_minimal_cost_factor_for_gitlab_contributors.yml
index 44f37c06d70..e571abdc97f 100644
--- a/config/feature_flags/development/infinitely_collapsible_sections.yml
+++ b/config/feature_flags/development/ci_minimal_cost_factor_for_gitlab_contributors.yml
@@ -1,8 +1,8 @@
 ---
-name: infinitely_collapsible_sections
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65496
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335297
-milestone: '14.1'
+name: ci_minimal_cost_factor_for_gitlab_contributors
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89742
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365862
+milestone: '15.2'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/ci_pending_builds_maintain_denormalized_data.yml b/config/feature_flags/development/ci_pending_builds_maintain_denormalized_data.yml
deleted file mode 100644
index 51c9fd21564..00000000000
--- a/config/feature_flags/development/ci_pending_builds_maintain_denormalized_data.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_pending_builds_maintain_denormalized_data
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75425
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354496
-milestone: '14.6'
-type: development
-group: group::pipeline execution
-default_enabled: true
diff --git a/config/feature_flags/development/ci_pending_builds_queue_source.yml b/config/feature_flags/development/ci_pending_builds_queue_source.yml
deleted file mode 100644
index 5fc2fcdb77a..00000000000
--- a/config/feature_flags/development/ci_pending_builds_queue_source.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_pending_builds_queue_source
-introduced_by_url:
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354496
-milestone: '14.0'
-type: development
-group: group::pipeline execution
-default_enabled: true
diff --git a/config/feature_flags/development/ci_queuing_use_denormalized_data_strategy.yml b/config/feature_flags/development/ci_queuing_use_denormalized_data_strategy.yml
deleted file mode 100644
index 43c7c8e7c2a..00000000000
--- a/config/feature_flags/development/ci_queuing_use_denormalized_data_strategy.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_queuing_use_denormalized_data_strategy
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76543
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354496
-milestone: '14.6'
-type: development
-group: group::pipeline execution
-default_enabled: true
diff --git a/config/feature_flags/development/confidential_notes.yml b/config/feature_flags/development/confidential_notes.yml
deleted file mode 100644
index 8c7197d2ef9..00000000000
--- a/config/feature_flags/development/confidential_notes.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: confidential_notes
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52949
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/207474
-milestone: '13.9'
-type: development
-group: group::product planning
-default_enabled: true
diff --git a/config/feature_flags/development/contacts_autocomplete.yml b/config/feature_flags/development/contacts_autocomplete.yml
deleted file mode 100644
index 2b0908e7343..00000000000
--- a/config/feature_flags/development/contacts_autocomplete.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: contacts_autocomplete
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79639
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352123
-milestone: '14.8'
-type: development
-group: group::product planning
-default_enabled: true
diff --git a/config/feature_flags/development/container_registry_legacy_authentication_for_deploy_tokens.yml b/config/feature_flags/development/container_registry_legacy_authentication_for_deploy_tokens.yml
new file mode 100644
index 00000000000..fefc84ed0a0
--- /dev/null
+++ b/config/feature_flags/development/container_registry_legacy_authentication_for_deploy_tokens.yml
@@ -0,0 +1,8 @@
+---
+name: container_registry_legacy_authentication_for_deploy_tokens
+introduced_by_url: https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/2470
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365968
+milestone: '15.1'
+type: development
+group: group::package
+default_enabled: false
diff --git a/config/feature_flags/development/container_registry_show_shortened_path.yml b/config/feature_flags/development/container_registry_show_shortened_path.yml
new file mode 100644
index 00000000000..33781386e8a
--- /dev/null
+++ b/config/feature_flags/development/container_registry_show_shortened_path.yml
@@ -0,0 +1,8 @@
+---
+name: container_registry_show_shortened_path
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91548
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366808
+milestone: '15.2'
+type: development
+group: group::package
+default_enabled: false
diff --git a/config/feature_flags/development/contribution_analytics_optimized_base_query.yml b/config/feature_flags/development/contribution_analytics_optimized_base_query.yml
new file mode 100644
index 00000000000..0e8697fb206
--- /dev/null
+++ b/config/feature_flags/development/contribution_analytics_optimized_base_query.yml
@@ -0,0 +1,8 @@
+---
+name: contribution_analytics_optimized_base_query
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91468
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367090
+milestone: '15.2'
+type: development
+group: group::optimize
+default_enabled: false
diff --git a/config/feature_flags/development/custom_headers_streaming_audit_events_ui.yml b/config/feature_flags/development/custom_headers_streaming_audit_events_ui.yml
new file mode 100644
index 00000000000..710a4f55130
--- /dev/null
+++ b/config/feature_flags/development/custom_headers_streaming_audit_events_ui.yml
@@ -0,0 +1,8 @@
+---
+name: custom_headers_streaming_audit_events_ui
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90135
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365259
+milestone: '15.2'
+type: development
+group: group::compliance
+default_enabled: false
diff --git a/config/feature_flags/development/delay_for_repository_update_mirror.yml b/config/feature_flags/development/delay_for_repository_update_mirror.yml
new file mode 100644
index 00000000000..c736036beb5
--- /dev/null
+++ b/config/feature_flags/development/delay_for_repository_update_mirror.yml
@@ -0,0 +1,8 @@
+---
+name: delay_for_repository_update_mirror
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90749
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365948
+milestone: '15.2'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/delayed_project_import_schedule_worker.yml b/config/feature_flags/development/delayed_project_import_schedule_worker.yml
deleted file mode 100644
index cdf42fbb8ec..00000000000
--- a/config/feature_flags/development/delayed_project_import_schedule_worker.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: delayed_project_import_schedule_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87438
-rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1681
-milestone: '15.0'
-type: development
-group: group::scalability
-default_enabled: false
diff --git a/config/feature_flags/development/ci_disallow_to_create_merge_request_pipelines_in_target_project.yml b/config/feature_flags/development/edit_tag_release_notes_via_release_page.yml
index 3962af65540..1f67eafc06b 100644
--- a/config/feature_flags/development/ci_disallow_to_create_merge_request_pipelines_in_target_project.yml
+++ b/config/feature_flags/development/edit_tag_release_notes_via_release_page.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_disallow_to_create_merge_request_pipelines_in_target_project
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40724
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235119
-milestone: '13.4'
+name: edit_tag_release_notes_via_release_page
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88832
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366244
+milestone: '15.2'
 type: development
 group: group::release
 default_enabled: false
diff --git a/config/feature_flags/development/externally_stored_diffs_caching_export.yml b/config/feature_flags/development/externally_stored_diffs_caching_export.yml
new file mode 100644
index 00000000000..395ce5c7cb9
--- /dev/null
+++ b/config/feature_flags/development/externally_stored_diffs_caching_export.yml
@@ -0,0 +1,8 @@
+---
+name: externally_stored_diffs_caching_export
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90159
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366255
+milestone: '15.2'
+type: development
+group: group::import
+default_enabled: false
diff --git a/config/feature_flags/development/fix_sliding_list_partitioning.yml b/config/feature_flags/development/fix_sliding_list_partitioning.yml
index 90b4bf87740..7d553ea938c 100644
--- a/config/feature_flags/development/fix_sliding_list_partitioning.yml
+++ b/config/feature_flags/development/fix_sliding_list_partitioning.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362246
 milestone: '15.1'
 type: development
 group: group::sharding
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/active_support_hash_digest_sha256.yml b/config/feature_flags/development/git_abuse_rate_limit_feature_flag.yml
index 147b84bf112..c71a5064b29 100644
--- a/config/feature_flags/development/active_support_hash_digest_sha256.yml
+++ b/config/feature_flags/development/git_abuse_rate_limit_feature_flag.yml
@@ -1,8 +1,8 @@
 ---
-name: active_support_hash_digest_sha256
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90098
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365314
+name: git_abuse_rate_limit_feature_flag
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87872
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364782
 milestone: '15.1'
 type: development
-group: group::sharding
+group: group::anti-abuse
 default_enabled: false
diff --git a/config/feature_flags/development/gitlab_error_tracking.yml b/config/feature_flags/development/gitlab_error_tracking.yml
new file mode 100644
index 00000000000..fa185416a94
--- /dev/null
+++ b/config/feature_flags/development/gitlab_error_tracking.yml
@@ -0,0 +1,8 @@
+---
+name: gitlab_error_tracking
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91148
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366382
+milestone: '15.2'
+type: development
+group: group::observability
+default_enabled: false
diff --git a/config/feature_flags/development/hard_failure_for_mirrors_without_license.yml b/config/feature_flags/development/hard_failure_for_mirrors_without_license.yml
new file mode 100644
index 00000000000..f138c8ea497
--- /dev/null
+++ b/config/feature_flags/development/hard_failure_for_mirrors_without_license.yml
@@ -0,0 +1,8 @@
+---
+name: hard_failure_for_mirrors_without_license
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92422
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367851
+milestone: '15.2'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/highlight_js.yml b/config/feature_flags/development/highlight_js.yml
index 40ea462447e..65f5fbc5b89 100644
--- a/config/feature_flags/development/highlight_js.yml
+++ b/config/feature_flags/development/highlight_js.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346257
 milestone: '14.6'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/import_release_authors_from_github.yml b/config/feature_flags/development/import_release_authors_from_github.yml
index b0ddca12d87..c263892fbf8 100644
--- a/config/feature_flags/development/import_release_authors_from_github.yml
+++ b/config/feature_flags/development/import_release_authors_from_github.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343448
 milestone: '15.1'
 type: development
 group: group::release
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/incident_timeline.yml b/config/feature_flags/development/incident_timeline.yml
index 09a08b9fcb6..587ef8b55e8 100644
--- a/config/feature_flags/development/incident_timeline.yml
+++ b/config/feature_flags/development/incident_timeline.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353426
 milestone: '14.9'
 type: development
 group: group::respond
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/issue_email_participants.yml b/config/feature_flags/development/issue_email_participants.yml
index 1459d2bc7f5..b5ebb9d8c13 100644
--- a/config/feature_flags/development/issue_email_participants.yml
+++ b/config/feature_flags/development/issue_email_participants.yml
@@ -1,7 +1,7 @@
 ---
 name: issue_email_participants
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49264
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350460
 milestone: '13.8'
 type: development
 group: group::product planning
diff --git a/config/feature_flags/development/issues_full_text_search.yml b/config/feature_flags/development/issues_full_text_search.yml
index 354dbede75f..31fe543e35e 100644
--- a/config/feature_flags/development/issues_full_text_search.yml
+++ b/config/feature_flags/development/issues_full_text_search.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354784
 milestone: '14.5'
 type: development
 group: group::project management
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/jobs_table_vue.yml b/config/feature_flags/development/job_log_search.yml
index ea489278b20..b6f1cec26f6 100644
--- a/config/feature_flags/development/jobs_table_vue.yml
+++ b/config/feature_flags/development/job_log_search.yml
@@ -1,8 +1,8 @@
 ---
-name: jobs_table_vue
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57155
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327500
-milestone: '13.11'
+name: job_log_search
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91293
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366455
+milestone: '15.2'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/ci_minutes_cost_factor_for_all_public_projects.yml b/config/feature_flags/development/legacy_merge_request_state_check_for_merged_result_pipelines.yml
index 24932e0cfe4..f0f38d8e9b2 100644
--- a/config/feature_flags/development/ci_minutes_cost_factor_for_all_public_projects.yml
+++ b/config/feature_flags/development/legacy_merge_request_state_check_for_merged_result_pipelines.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_minutes_cost_factor_for_all_public_projects
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85357
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/359094
-milestone: '15.0'
+name: legacy_merge_request_state_check_for_merged_result_pipelines
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91849
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367019
+milestone: '15.2'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/group_name_path_vue.yml b/config/feature_flags/development/log_response_length.yml
index 6ecb0eaf20e..1ade057204c 100644
--- a/config/feature_flags/development/group_name_path_vue.yml
+++ b/config/feature_flags/development/log_response_length.yml
@@ -1,8 +1,8 @@
 ---
-name: group_name_path_vue
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88085
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363623
-milestone: '15.1'
+name: log_response_length
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91448
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366854
+milestone: '15.3'
 type: development
 group: group::workspace
 default_enabled: false
diff --git a/config/feature_flags/development/measure_service_ping_metric_collection.yml b/config/feature_flags/development/measure_service_ping_metric_collection.yml
deleted file mode 100644
index c480bdedae6..00000000000
--- a/config/feature_flags/development/measure_service_ping_metric_collection.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: measure_service_ping_metric_collection
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82607
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358128
-milestone: '15.0'
-type: development
-group: group::product intelligence
-default_enabled: true
diff --git a/config/feature_flags/development/migrate_vulnerability_finding_uuids.yml b/config/feature_flags/development/migrate_vulnerability_finding_uuids.yml
deleted file mode 100644
index dc168ba5374..00000000000
--- a/config/feature_flags/development/migrate_vulnerability_finding_uuids.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: migrate_vulnerability_finding_uuids
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75546
-rollout_issue_url:
-milestone: '14.7'
-type: development
-group: group::threat insights
-default_enabled: true
diff --git a/config/feature_flags/development/file_identifier_hash.yml b/config/feature_flags/development/mr_experience_survey.yml
index 84879e6c33e..c6487dbaf3a 100644
--- a/config/feature_flags/development/file_identifier_hash.yml
+++ b/config/feature_flags/development/mr_experience_survey.yml
@@ -1,8 +1,8 @@
 ---
-name: file_identifier_hash
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33028
-rollout_issue_url: 
-milestone: '13.1'
+name: mr_experience_survey
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90036
+rollout_issue_url:
+milestone: '15.2'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/ci_child_pipeline_coverage_reports.yml b/config/feature_flags/development/mr_show_reports_immediately.yml
index c77bd223eff..23ac381a521 100644
--- a/config/feature_flags/development/ci_child_pipeline_coverage_reports.yml
+++ b/config/feature_flags/development/mr_show_reports_immediately.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_child_pipeline_coverage_reports
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88626
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363557
-milestone: '15.1'
+name: mr_show_reports_immediately
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76612
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367027
+milestone: '15.2'
 type: development
 group: group::pipeline insights
 default_enabled: false
diff --git a/config/feature_flags/development/namespace_storage_limit_show_preenforcement_banner.yml b/config/feature_flags/development/namespace_storage_limit_show_preenforcement_banner.yml
new file mode 100644
index 00000000000..754a6a16356
--- /dev/null
+++ b/config/feature_flags/development/namespace_storage_limit_show_preenforcement_banner.yml
@@ -0,0 +1,8 @@
+---
+name: namespace_storage_limit_show_preenforcement_banner
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350632
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362340
+milestone: '15.2'
+type: development
+group: group::utilization
+default_enabled: false
diff --git a/config/feature_flags/development/omniauth_login_minimal_scopes.yml b/config/feature_flags/development/omniauth_login_minimal_scopes.yml
deleted file mode 100644
index b2ca3484a98..00000000000
--- a/config/feature_flags/development/omniauth_login_minimal_scopes.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: omniauth_login_minimal_scopes
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78556
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351331
-milestone: '14.8'
-type: development
-group: 'group::authentication and authorization'
-default_enabled: false
diff --git a/config/feature_flags/development/operational_vulnerabilities_filters.yml b/config/feature_flags/development/operational_vulnerabilities_filters.yml
new file mode 100644
index 00000000000..0a96954ef66
--- /dev/null
+++ b/config/feature_flags/development/operational_vulnerabilities_filters.yml
@@ -0,0 +1,8 @@
+---
+name: operational_vulnerabilities_filters
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90845
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365986
+milestone: '15.2'
+type: development
+group: group::container security
+default_enabled: false
diff --git a/config/feature_flags/development/optimized_followed_users_queries.yml b/config/feature_flags/development/optimized_followed_users_queries.yml
deleted file mode 100644
index 9e08810659b..00000000000
--- a/config/feature_flags/development/optimized_followed_users_queries.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: optimized_followed_users_queries
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84856
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358649
-milestone: '15.0'
-type: development
-group: group::optimize
-default_enabled: true
diff --git a/config/feature_flags/development/paginated_issue_discussions.yml b/config/feature_flags/development/paginated_issue_discussions.yml
deleted file mode 100644
index f4e765bd7f2..00000000000
--- a/config/feature_flags/development/paginated_issue_discussions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: paginated_issue_discussions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69933
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345351
-milestone: '14.5'
-type: development
-group: group::project management
-default_enabled: false
diff --git a/config/feature_flags/development/pbkdf2_password_encryption.yml b/config/feature_flags/development/pbkdf2_password_encryption.yml
new file mode 100644
index 00000000000..995173a6a38
--- /dev/null
+++ b/config/feature_flags/development/pbkdf2_password_encryption.yml
@@ -0,0 +1,8 @@
+---
+name: pbkdf2_password_encryption
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91622
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367147
+milestone: '15.2'
+type: development
+group: group::authentication and authorization
+default_enabled: false
diff --git a/config/feature_flags/development/ci_build_finished_worker_namespace_changed.yml b/config/feature_flags/development/pbkdf2_password_encryption_write.yml
index 3b25bc1ed39..29c7baedaf2 100644
--- a/config/feature_flags/development/ci_build_finished_worker_namespace_changed.yml
+++ b/config/feature_flags/development/pbkdf2_password_encryption_write.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_build_finished_worker_namespace_changed
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64934
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335499
-milestone: '14.1'
+name: pbkdf2_password_encryption_write
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91622
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367147
+milestone: '15.2'
 type: development
-group: group::pipeline execution
+group: group::authentication and authorization
 default_enabled: false
diff --git a/config/feature_flags/development/prerecord_service_ping_data.yml b/config/feature_flags/development/prerecord_service_ping_data.yml
deleted file mode 100644
index ad284dbcce8..00000000000
--- a/config/feature_flags/development/prerecord_service_ping_data.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: prerecord_service_ping_data
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85503
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360675
-milestone: '15.0'
-type: development
-group: group::product intelligence
-default_enabled: true
diff --git a/config/feature_flags/development/prevent_abusive_searches.yml b/config/feature_flags/development/prevent_abusive_searches.yml
deleted file mode 100644
index 1c08e0d16cb..00000000000
--- a/config/feature_flags/development/prevent_abusive_searches.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: prevent_abusive_searches
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74953
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346263
-milestone: '14.6'
-type: development
-group: group::global search
-default_enabled: false
diff --git a/config/feature_flags/development/projects_build_artifacts_size_refresh_high.yml b/config/feature_flags/development/projects_build_artifacts_size_refresh_high.yml
deleted file mode 100644
index 77b5feafd6a..00000000000
--- a/config/feature_flags/development/projects_build_artifacts_size_refresh_high.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: projects_build_artifacts_size_refresh_high
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81306
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356018
-milestone: '14.9'
-type: development
-group: group::pipeline insights
-default_enabled: false
diff --git a/config/feature_flags/development/projects_build_artifacts_size_refresh_low.yml b/config/feature_flags/development/projects_build_artifacts_size_refresh_low.yml
deleted file mode 100644
index cefecb245e3..00000000000
--- a/config/feature_flags/development/projects_build_artifacts_size_refresh_low.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: projects_build_artifacts_size_refresh_low
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81306
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356018
-milestone: '14.9'
-type: development
-group: group::pipeline insights
-default_enabled: false
diff --git a/config/feature_flags/development/projects_build_artifacts_size_refresh_medium.yml b/config/feature_flags/development/projects_build_artifacts_size_refresh_medium.yml
deleted file mode 100644
index caeb6647782..00000000000
--- a/config/feature_flags/development/projects_build_artifacts_size_refresh_medium.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: projects_build_artifacts_size_refresh_medium
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81306
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356018
-milestone: '14.9'
-type: development
-group: group::pipeline insights
-default_enabled: false
diff --git a/config/feature_flags/development/rebalance_issues.yml b/config/feature_flags/development/rebalance_issues.yml
index 5b2a4c2437b..5651b02b073 100644
--- a/config/feature_flags/development/rebalance_issues.yml
+++ b/config/feature_flags/development/rebalance_issues.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/239344
 milestone: '13.4'
 type: development
 group: group::project management
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/refactor_code_quality_inline_findings.yml b/config/feature_flags/development/refactor_code_quality_inline_findings.yml
new file mode 100644
index 00000000000..3f2e35c202d
--- /dev/null
+++ b/config/feature_flags/development/refactor_code_quality_inline_findings.yml
@@ -0,0 +1,8 @@
+---
+name: refactor_code_quality_inline_findings
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88576
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364198 
+milestone: '15.1'
+type: development
+group: group::static analysis
+default_enabled: false
diff --git a/config/feature_flags/development/refactor_mr_widgets_extensions.yml b/config/feature_flags/development/refactor_mr_widgets_extensions.yml
index 5b6ea22aafe..3f71e786f99 100644
--- a/config/feature_flags/development/refactor_mr_widgets_extensions.yml
+++ b/config/feature_flags/development/refactor_mr_widgets_extensions.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341759
 milestone: '14.4'
 type: development
 group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/require_email_verification.yml b/config/feature_flags/development/require_email_verification.yml
new file mode 100644
index 00000000000..e6cb78ffcf7
--- /dev/null
+++ b/config/feature_flags/development/require_email_verification.yml
@@ -0,0 +1,8 @@
+---
+name: require_email_verification
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86352
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364835
+milestone: "15.2"
+type: development
+group: group::anti-abuse
+default_enabled: false
diff --git a/config/feature_flags/development/show_minute_limit_banner.yml b/config/feature_flags/development/skip_group_share_unlink_auth_refresh.yml
index ecf9d98bea2..cd7acaceaf5 100644
--- a/config/feature_flags/development/show_minute_limit_banner.yml
+++ b/config/feature_flags/development/skip_group_share_unlink_auth_refresh.yml
@@ -1,8 +1,8 @@
 ---
-name: show_minute_limit_banner
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84644
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358191
-milestone: '14.10'
+name: skip_group_share_unlink_auth_refresh
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90871
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366086
+milestone: '15.2'
 type: development
 group: group::workspace
 default_enabled: false
diff --git a/config/feature_flags/development/skip_scheduling_mirrors_for_free.yml b/config/feature_flags/development/skip_scheduling_mirrors_for_free.yml
new file mode 100644
index 00000000000..09f41fa9ff4
--- /dev/null
+++ b/config/feature_flags/development/skip_scheduling_mirrors_for_free.yml
@@ -0,0 +1,8 @@
+---
+name: skip_scheduling_mirrors_for_free
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92377
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367712
+milestone: '15.2'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/closed_as_duplicate_of_issues_api.yml b/config/feature_flags/development/split_operations_visibility_permissions.yml
index 6628feb3879..612876a2dcd 100644
--- a/config/feature_flags/development/closed_as_duplicate_of_issues_api.yml
+++ b/config/feature_flags/development/split_operations_visibility_permissions.yml
@@ -1,7 +1,7 @@
 ---
-name: closed_as_duplicate_of_issues_api
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89375
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364749
+name: split_operations_visibility_permissions
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89089
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364240
 milestone: '15.1'
 type: development
 group: group::respond
diff --git a/config/feature_flags/development/ssh_banned_key.yml b/config/feature_flags/development/ssh_banned_key.yml
deleted file mode 100644
index e628e440176..00000000000
--- a/config/feature_flags/development/ssh_banned_key.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ssh_banned_key
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87541
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363410
-milestone: '15.1'
-type: development
-group: 'group::authentication and authorization'
-default_enabled: true
diff --git a/config/feature_flags/development/sticky_ci_archive_trace_worker.yml b/config/feature_flags/development/sticky_ci_archive_trace_worker.yml
deleted file mode 100644
index 9494f6070f4..00000000000
--- a/config/feature_flags/development/sticky_ci_archive_trace_worker.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: sticky_ci_archive_trace_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87577
-rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1681
-milestone: '15.1'
-type: development
-group: group::scalability
-default_enabled: false
diff --git a/config/feature_flags/development/refactor_blob_viewer.yml b/config/feature_flags/development/subgroups_approval_rules.yml
index 2c418e87a49..13f4e872b4f 100644
--- a/config/feature_flags/development/refactor_blob_viewer.yml
+++ b/config/feature_flags/development/subgroups_approval_rules.yml
@@ -1,8 +1,8 @@
 ---
-name: refactor_blob_viewer
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57326
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/324351
-milestone: '13.11'
+name: subgroups_approval_rules
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91598
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366741
+milestone: '15.2'
 type: development
 group: group::source code
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/tag_list_keyset_pagination.yml b/config/feature_flags/development/tag_list_keyset_pagination.yml
index 54bd96d82cf..52c21e22d9f 100644
--- a/config/feature_flags/development/tag_list_keyset_pagination.yml
+++ b/config/feature_flags/development/tag_list_keyset_pagination.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345595
 milestone: '14.5'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/update_oauth_registration_flow.yml b/config/feature_flags/development/update_oauth_registration_flow.yml
index 5dd565e2143..7b066ebf9ab 100644
--- a/config/feature_flags/development/update_oauth_registration_flow.yml
+++ b/config/feature_flags/development/update_oauth_registration_flow.yml
@@ -1,8 +1,8 @@
 ---
 name: update_oauth_registration_flow
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85871
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363030
-milestone: '15.1'
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364342
+milestone: '15.2'
 type: development
-group: group::adoption
+group: group::acquisition
 default_enabled: false
diff --git a/config/feature_flags/development/use_click_house_database_for_error_tracking.yml b/config/feature_flags/development/use_click_house_database_for_error_tracking.yml
new file mode 100644
index 00000000000..15d31568fb0
--- /dev/null
+++ b/config/feature_flags/development/use_click_house_database_for_error_tracking.yml
@@ -0,0 +1,8 @@
+---
+name: use_click_house_database_for_error_tracking
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90675
+rollout_issue_url: https://gitlab.com/gitlab-org/opstrace/opstrace/-/issues/1728
+milestone: '15.2'
+type: development
+group: group::observability
+default_enabled: false
diff --git a/config/feature_flags/development/vsa_reaggregation_worker.yml b/config/feature_flags/development/use_keyset_aware_user_search_query.yml
index a3cc83722a3..8c2babfd1c7 100644
--- a/config/feature_flags/development/vsa_reaggregation_worker.yml
+++ b/config/feature_flags/development/use_keyset_aware_user_search_query.yml
@@ -1,8 +1,8 @@
 ---
-name: vsa_reaggregation_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84171
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357647
-milestone: '14.10'
+name: use_keyset_aware_user_search_query
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91764
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367025
+milestone: '15.2'
 type: development
 group: group::optimize
 default_enabled: true
diff --git a/config/feature_flags/development/standard_context_type_check.yml b/config/feature_flags/development/use_redis_hll_instrumentation_classes.yml
index 1c6094abbf4..46e53688b70 100644
--- a/config/feature_flags/development/standard_context_type_check.yml
+++ b/config/feature_flags/development/use_redis_hll_instrumentation_classes.yml
@@ -1,7 +1,7 @@
 ---
-name: standard_context_type_check
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88540
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364265
+name: use_redis_hll_instrumentation_classes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90237 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365332
 milestone: '15.1'
 type: development
 group: group::product intelligence
diff --git a/config/feature_flags/development/use_status_for_repository_update_mirror.yml b/config/feature_flags/development/use_status_for_repository_update_mirror.yml
deleted file mode 100644
index 37c26f14791..00000000000
--- a/config/feature_flags/development/use_status_for_repository_update_mirror.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_status_for_repository_update_mirror
-introduced_by_url: 
-rollout_issue_url: 
-milestone: '15.1'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/deployment_hooks_skip_worker.yml b/config/feature_flags/development/web_hooks_no_rate_limit.yml
index d7d35912e2d..387aa8bb007 100644
--- a/config/feature_flags/development/deployment_hooks_skip_worker.yml
+++ b/config/feature_flags/development/web_hooks_no_rate_limit.yml
@@ -1,8 +1,8 @@
 ---
-name: deployment_hooks_skip_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83351
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356468
-milestone: '14.10'
+name: web_hooks_no_rate_limit
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90868
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366084
+milestone: '15.2'
 type: development
 group: group::integrations
 default_enabled: false
diff --git a/config/feature_flags/development/rename_integrations_workers.yml b/config/feature_flags/development/webhooks_failed_callout.yml
index 307b21c0545..11de5a793f6 100644
--- a/config/feature_flags/development/rename_integrations_workers.yml
+++ b/config/feature_flags/development/webhooks_failed_callout.yml
@@ -1,8 +1,8 @@
 ---
-name: rename_integrations_workers
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88558
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364112
-milestone: '15.1'
+name: webhooks_failed_callout
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91092
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365535
+milestone: '15.2'
 type: development
 group: group::integrations
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/monitor_logging.yml b/config/feature_flags/development/wiki_front_matter.yml
index e9e3f49a3bb..39196440d17 100644
--- a/config/feature_flags/development/monitor_logging.yml
+++ b/config/feature_flags/development/wiki_front_matter.yml
@@ -1,8 +1,8 @@
 ---
-name: monitor_logging
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86214
-rollout_issue_url:
-milestone: '15.0'
+name: wiki_front_matter
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27706
+rollout_issue_url: 
+milestone: '12.10'
 type: development
-group: group::respond
+group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/experiment/combined_registration.yml b/config/feature_flags/experiment/combined_registration.yml
index 1be740c7141..0b867353946 100644
--- a/config/feature_flags/experiment/combined_registration.yml
+++ b/config/feature_flags/experiment/combined_registration.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67614
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/285533
 milestone: '14.3'
 type: experiment
-group: group::adoption
+group: group::acquisition
 default_enabled: false
diff --git a/config/feature_flags/experiment/invite_members_in_side_nav.yml b/config/feature_flags/experiment/invite_members_in_side_nav.yml
index 7968a885374..1cb8d6d2b0a 100644
--- a/config/feature_flags/experiment/invite_members_in_side_nav.yml
+++ b/config/feature_flags/experiment/invite_members_in_side_nav.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70451
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342951
 milestone: '14.5'
 type: experiment
-group: group::expansion
+group: group::acquisition
 default_enabled: false
diff --git a/config/feature_flags/experiment/null_hypothesis.yml b/config/feature_flags/experiment/null_hypothesis.yml
index 8ac76809842..bf1526fa950 100644
--- a/config/feature_flags/experiment/null_hypothesis.yml
+++ b/config/feature_flags/experiment/null_hypothesis.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45840
 rollout_issue_url:
 milestone: '13.7'
 type: experiment
-group: group::adoption
+group: group::acquisition
 default_enabled: false
diff --git a/config/feature_flags/experiment/pql_three_cta_test.yml b/config/feature_flags/experiment/pql_three_cta_test.yml
index f65d3080c05..aa46c51d7ed 100644
--- a/config/feature_flags/experiment/pql_three_cta_test.yml
+++ b/config/feature_flags/experiment/pql_three_cta_test.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74054
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349799
 milestone: '14.7'
 type: experiment
-group: group::conversion
+group: group::acquisition
 default_enabled: false
diff --git a/config/feature_flags/experiment/security_actions_continuous_onboarding.yml b/config/feature_flags/experiment/security_actions_continuous_onboarding.yml
new file mode 100644
index 00000000000..ce7124cf0c8
--- /dev/null
+++ b/config/feature_flags/experiment/security_actions_continuous_onboarding.yml
@@ -0,0 +1,8 @@
+---
+name: security_actions_continuous_onboarding
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82274
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345176
+milestone: '15.2'
+type: experiment
+group: group::acquisition
+default_enabled: false
diff --git a/config/feature_flags/experiment/security_reports_mr_widget_prompt.yml b/config/feature_flags/experiment/security_reports_mr_widget_prompt.yml
index ca6d17b1720..16cc3d890d7 100644
--- a/config/feature_flags/experiment/security_reports_mr_widget_prompt.yml
+++ b/config/feature_flags/experiment/security_reports_mr_widget_prompt.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70086
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340436
 milestone: '14.3'
 type: experiment
-group: group::adoption
+group: group::acquisition
 default_enabled: false
diff --git a/config/feature_flags/experiment/showcase_free_security_features.yml b/config/feature_flags/experiment/showcase_free_security_features.yml
new file mode 100644
index 00000000000..e9a55d03adc
--- /dev/null
+++ b/config/feature_flags/experiment/showcase_free_security_features.yml
@@ -0,0 +1,8 @@
+---
+name: showcase_free_security_features
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85359
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360677
+milestone: '15.2'
+type: experiment
+group: group::acquisition
+default_enabled: false
diff --git a/config/feature_flags/experiment/video_tutorials_continuous_onboarding.yml b/config/feature_flags/experiment/video_tutorials_continuous_onboarding.yml
index 6dc3f798f63..e047a4e9682 100644
--- a/config/feature_flags/experiment/video_tutorials_continuous_onboarding.yml
+++ b/config/feature_flags/experiment/video_tutorials_continuous_onboarding.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82274
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351916
 milestone: '14.9'
 type: experiment
-group: group::adoption
+group: group::acquisition
 default_enabled: false
diff --git a/config/feature_flags/ops/batched_migrations_health_status_autovacuum.yml b/config/feature_flags/ops/batched_migrations_health_status_autovacuum.yml
new file mode 100644
index 00000000000..f0e4dfcabb9
--- /dev/null
+++ b/config/feature_flags/ops/batched_migrations_health_status_autovacuum.yml
@@ -0,0 +1,8 @@
+---
+name: batched_migrations_health_status_autovacuum
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85196
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360331
+milestone: '15.2'
+type: ops
+group: group::database
+default_enabled: false
diff --git a/config/feature_flags/development/jobs_table_vue_search.yml b/config/feature_flags/ops/ci_minimal_cost_factor_for_gitlab_namespaces.yml
index ad0c25eccce..fbbd4d9672b 100644
--- a/config/feature_flags/development/jobs_table_vue_search.yml
+++ b/config/feature_flags/ops/ci_minimal_cost_factor_for_gitlab_namespaces.yml
@@ -1,8 +1,8 @@
 ---
-name: jobs_table_vue_search
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82539
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356007
-milestone: '14.10'
-type: development
+name: ci_minimal_cost_factor_for_gitlab_namespaces
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89742
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367692
+milestone: '15.2'
+type: ops
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/ops/ci_pipeline_age_histogram.yml b/config/feature_flags/ops/ci_pipeline_age_histogram.yml
new file mode 100644
index 00000000000..bbf7edfa9b9
--- /dev/null
+++ b/config/feature_flags/ops/ci_pipeline_age_histogram.yml
@@ -0,0 +1,8 @@
+---
+name: ci_pipeline_age_histogram
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90027
+rollout_issue_url: 
+milestone: '15.1'
+type: ops
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/ops/enforce_memory_watchdog.yml b/config/feature_flags/ops/enforce_memory_watchdog.yml
new file mode 100644
index 00000000000..1d1f9a4eef0
--- /dev/null
+++ b/config/feature_flags/ops/enforce_memory_watchdog.yml
@@ -0,0 +1,8 @@
+---
+name: enforce_memory_watchdog
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91910
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367534
+milestone: '15.2'
+type: ops
+group: group::memory
+default_enabled: false
diff --git a/config/feature_flags/ops/github_importer_issue_events_import.yml b/config/feature_flags/ops/github_importer_issue_events_import.yml
new file mode 100644
index 00000000000..c4710858a0a
--- /dev/null
+++ b/config/feature_flags/ops/github_importer_issue_events_import.yml
@@ -0,0 +1,8 @@
+---
+name: github_importer_issue_events_import
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89134
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365977
+milestone: '15.2'
+type: ops
+group: group::import
+default_enabled: false
diff --git a/config/feature_flags/ops/gitlab_experiment.yml b/config/feature_flags/ops/gitlab_experiment.yml
index bd676fc7c9c..faf55130c33 100644
--- a/config/feature_flags/ops/gitlab_experiment.yml
+++ b/config/feature_flags/ops/gitlab_experiment.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81834
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353921
 milestone: '14.9'
 type: ops
-group: group::conversion
+group: group::acquisition
 default_enabled: true
diff --git a/config/feature_flags/ops/gitlab_memory_watchdog.yml b/config/feature_flags/ops/gitlab_memory_watchdog.yml
new file mode 100644
index 00000000000..9b995ea607e
--- /dev/null
+++ b/config/feature_flags/ops/gitlab_memory_watchdog.yml
@@ -0,0 +1,8 @@
+---
+name: gitlab_memory_watchdog
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91910
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367534
+milestone: '15.2'
+type: ops
+group: group::memory
+default_enabled: false
diff --git a/config/feature_flags/ops/projects_build_artifacts_size_refresh.yml b/config/feature_flags/ops/projects_build_artifacts_size_refresh.yml
new file mode 100644
index 00000000000..8b54a0e3ff5
--- /dev/null
+++ b/config/feature_flags/ops/projects_build_artifacts_size_refresh.yml
@@ -0,0 +1,8 @@
+---
+name: projects_build_artifacts_size_refresh
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84701
+rollout_issue_url:
+milestone: '15.1'
+type: ops
+group: group::pipeline insights
+default_enabled: true
diff --git a/config/feature_flags/ops/remote_mirror_no_delay.yml b/config/feature_flags/ops/remote_mirror_no_delay.yml
new file mode 100644
index 00000000000..17937b35cf0
--- /dev/null
+++ b/config/feature_flags/ops/remote_mirror_no_delay.yml
@@ -0,0 +1,7 @@
+---
+name: remote_mirror_no_delay
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92093
+milestone: '15.2'
+type: ops
+group: group::scalability
+default_enabled: false
diff --git a/config/feature_flags/undefined/gitaly_revlist_for_repo_size.yml b/config/feature_flags/undefined/gitaly_revlist_for_repo_size.yml
new file mode 100644
index 00000000000..376874b2c83
--- /dev/null
+++ b/config/feature_flags/undefined/gitaly_revlist_for_repo_size.yml
@@ -0,0 +1,8 @@
+---
+name: gitaly_revlist_for_repo_size
+introduced_by_url:
+rollout_issue_url:
+milestone:
+type: undefined
+group:
+default_enabled: false
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 841e7670e45..78ddc0afa3a 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -540,6 +540,10 @@ production: &base
     ci_platform_metrics_update_cron_worker:
       cron: "47 9 * * *"
 
+    # Periodically update ci_runner_versions table with up-to-date versions and status.
+    ci_runner_versions_reconciliation_worker:
+      cron: "20 * * * *"
+
   # GitLab EE only jobs. These jobs are automatically enabled for an EE
   # installation, and ignored for a CE installation.
   ee_cron_jobs:
@@ -661,12 +665,6 @@ production: &base
 
   gitlab_ci:
     # Default project notifications settings:
-    #
-    # Send emails only on broken builds (default: true)
-    # all_broken_builds: true
-    #
-    # Add pusher to recipients list (default: false)
-    # add_pusher: true
 
     # The location where build traces are stored (default: builds/). Relative paths are relative to Rails.root
     # builds_path: builds/
@@ -1266,24 +1264,29 @@ production: &base
     ip_whitelist:
       - 127.0.0.0/8
 
-    # Sidekiq exporter is webserver built in to Sidekiq to expose Prometheus metrics
+    # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq.
     sidekiq_exporter:
     #  enabled: true
     #  log_enabled: false
     #  address: localhost
     #  port: 8082
+    #  tls_enabled: false
+    #  tls_cert_path: /path/to/cert.pem
+    #  tls_key_path: /path/to/key.pem
 
     sidekiq_health_checks:
     #  enabled: true
     #  address: localhost
     #  port: 8092
 
-    # Web exporter is a dedicated Rack server running alongside Puma to expose Prometheus metrics
-    # It runs alongside the `/metrics` endpoints to ease the publish of metrics
+    # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma.
     web_exporter:
     #  enabled: true
     #  address: localhost
     #  port: 8083
+    #  tls_enabled: false
+    #  tls_cert_path: /path/to/cert.pem
+    #  tls_key_path: /path/to/key.pem
 
   ## Prometheus settings
   # Do not modify these settings here. They should be modified in /etc/gitlab/gitlab.rb
@@ -1294,6 +1297,9 @@ production: &base
   prometheus:
     # enabled: true
     # server_address: 'localhost:9090'
+  snowplow_micro:
+    enabled: true
+    address: '127.0.0.1:9091'
 
   ## Consul settings
   consul:
diff --git a/config/gitlab_loose_foreign_keys.yml b/config/gitlab_loose_foreign_keys.yml
index 309afe413cc..8a9f3f0da43 100644
--- a/config/gitlab_loose_foreign_keys.yml
+++ b/config/gitlab_loose_foreign_keys.yml
@@ -219,6 +219,10 @@ requirements_management_test_reports:
   - table: ci_builds
     column: build_id
     on_delete: async_nullify
+sbom_occurrences:
+  - table: ci_pipelines
+    column: pipeline_id
+    on_delete: async_nullify
 security_scans:
   - table: ci_builds
     column: build_id
diff --git a/config/initializers/00_connection_logger.rb b/config/initializers/00_connection_logger.rb
deleted file mode 100644
index 9f03d13f95f..00000000000
--- a/config/initializers/00_connection_logger.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module NewConnectionLogger
-  extend ActiveSupport::Concern
-
-  prepended do |base|
-    base.class_attribute :warn_on_new_connection, default: false
-  end
-
-  class_methods do
-    def new_client(...)
-      if warn_on_new_connection && !ENV['SKIP_LOG_INITIALIZER_CONNECTIONS']
-        cleaned_caller = Gitlab::BacktraceCleaner.clean_backtrace(caller)
-        message = "Database connection should not be called during initializers. Read more at https://docs.gitlab.com/ee/development/rails_initializers.html#database-connections-in-initializers"
-
-        ActiveSupport::Deprecation.warn(message, cleaned_caller)
-
-        warn caller if ENV['DEBUG_INITIALIZER_CONNECTIONS']
-      end
-
-      super
-    end
-  end
-end
-
-ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(NewConnectionLogger)
diff --git a/config/initializers/0_log_deprecations.rb b/config/initializers/0_log_deprecations.rb
index 20fb5144937..6ba18ea1136 100644
--- a/config/initializers/0_log_deprecations.rb
+++ b/config/initializers/0_log_deprecations.rb
@@ -9,11 +9,15 @@ end
 if log_deprecations?
   # Log deprecation warnings emitted through Kernel#warn, such as from gems or
   # the Ruby VM.
-  Warning.process(/.+is deprecated$/) do |warning|
-    Gitlab::DeprecationJsonLogger.info(message: warning.strip, source: 'ruby')
-    # Returning :default means we continue emitting this to stderr as well.
-    :default
-  end
+  actions = {
+    /.+is deprecated$/ => lambda do |warning|
+      Gitlab::DeprecationJsonLogger.info(message: warning.strip, source: 'ruby')
+      # Returning :default means we continue emitting this to stderr as well.
+      :default
+    end
+  }
+
+  Warning.process('', actions)
 
   # Log deprecation warnings emitted from Rails (see ActiveSupport::Deprecation).
   ActiveSupport::Notifications.subscribe('deprecation.rails') do |name, start, finish, id, payload|
diff --git a/config/initializers/1_acts_as_taggable.rb b/config/initializers/1_acts_as_taggable.rb
index 59412aef755..0c34bf3941b 100644
--- a/config/initializers/1_acts_as_taggable.rb
+++ b/config/initializers/1_acts_as_taggable.rb
@@ -15,3 +15,36 @@ raise "Counter cache is not disabled" if
   model.connection_specification_name = Ci::ApplicationRecord.connection_specification_name
   model.singleton_class.delegate :connection, :sticking, to: '::Ci::ApplicationRecord'
 end
+
+# Modified from https://github.com/mbleigh/acts-as-taggable-on/pull/1081
+# with insert_all, which is not supported in MySQL
+# See https://gitlab.com/gitlab-org/gitlab/-/issues/338346#note_996969960
+module ActsAsTaggableOnTagPatch
+  def find_or_create_all_with_like_by_name(*list)
+    list = Array(list).flatten
+
+    return [] if list.empty?
+
+    existing_tags = named_any(list)
+
+    missing = list.reject do |tag_name|
+      comparable_tag_name = comparable_name(tag_name)
+      existing_tags.find { |tag| comparable_name(tag.name) == comparable_tag_name }
+    end
+
+    if missing.empty?
+      new_tags = []
+    else
+      attributes_to_add = missing.map do |tag_name|
+        { name: tag_name }
+      end
+
+      insert_all(attributes_to_add, unique_by: :name)
+      new_tags = named_any(missing)
+    end
+
+    existing_tags + new_tags
+  end
+end
+
+::ActsAsTaggableOn::Tag.singleton_class.prepend(ActsAsTaggableOnTagPatch)
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 8de514e9455..2de4efbe8ef 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -241,8 +241,6 @@ end
 #
 Settings['gitlab_ci'] ||= Settingslogic.new({})
 Settings.gitlab_ci['shared_runners_enabled'] = true if Settings.gitlab_ci['shared_runners_enabled'].nil?
-Settings.gitlab_ci['all_broken_builds']     = true if Settings.gitlab_ci['all_broken_builds'].nil?
-Settings.gitlab_ci['add_pusher']            = false if Settings.gitlab_ci['add_pusher'].nil?
 Settings.gitlab_ci['builds_path']           = Settings.absolute(Settings.gitlab_ci['builds_path'] || "builds/")
 Settings.gitlab_ci['url']                 ||= Settings.__send__(:build_gitlab_ci_url)
 
@@ -632,6 +630,9 @@ Settings.cron_jobs['inactive_projects_deletion_cron_worker']['job_class'] = 'Pro
 Settings.cron_jobs['loose_foreign_keys_cleanup_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['loose_foreign_keys_cleanup_worker']['cron'] ||= '*/1 * * * *'
 Settings.cron_jobs['loose_foreign_keys_cleanup_worker']['job_class'] = 'LooseForeignKeys::CleanupWorker'
+Settings.cron_jobs['ci_runner_versions_reconciliation_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['ci_runner_versions_reconciliation_worker']['cron'] ||= '20 * * * *'
+Settings.cron_jobs['ci_runner_versions_reconciliation_worker']['job_class'] = 'Ci::Runners::ReconcileExistingRunnerVersionsCronWorker'
 
 Gitlab.ee do
   Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker'] ||= Settingslogic.new({})
@@ -971,6 +972,9 @@ Settings.monitoring.sidekiq_exporter['enabled'] ||= false
 Settings.monitoring.sidekiq_exporter['log_enabled'] ||= false
 Settings.monitoring.sidekiq_exporter['address'] ||= 'localhost'
 Settings.monitoring.sidekiq_exporter['port'] ||= 8082
+Settings.monitoring.sidekiq_exporter['tls_enabled'] ||= false
+Settings.monitoring.sidekiq_exporter['tls_cert_path'] ||= nil
+Settings.monitoring.sidekiq_exporter['tls_key_path'] ||= nil
 
 Settings.monitoring['sidekiq_health_checks'] ||= Settingslogic.new({})
 Settings.monitoring.sidekiq_health_checks['enabled'] ||= false
@@ -981,6 +985,9 @@ Settings.monitoring['web_exporter'] ||= Settingslogic.new({})
 Settings.monitoring.web_exporter['enabled'] ||= false
 Settings.monitoring.web_exporter['address'] ||= 'localhost'
 Settings.monitoring.web_exporter['port'] ||= 8083
+Settings.monitoring.web_exporter['tls_enabled'] ||= false
+Settings.monitoring.web_exporter['tls_cert_path'] ||= nil
+Settings.monitoring.web_exporter['tls_key_path'] ||= nil
 
 #
 # Prometheus settings
diff --git a/config/initializers/8_devise.rb b/config/initializers/8_devise.rb
index 3cac012c2f7..65314c4472f 100644
--- a/config/initializers/8_devise.rb
+++ b/config/initializers/8_devise.rb
@@ -184,7 +184,7 @@ Devise.setup do |config|
   # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
   # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
   # REST_AUTH_SITE_KEY to pepper)
-  # config.encryptor = :sha512
+  config.encryptor = :pbkdf2_sha512
 
   # Authentication through token does not store user in session and needs
   # to be supplied on each request. Useful if you are using the token as API token.
diff --git a/config/initializers/database_config.rb b/config/initializers/database_config.rb
index 84ef0bc9f16..31666c884bc 100644
--- a/config/initializers/database_config.rb
+++ b/config/initializers/database_config.rb
@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 Gitlab.ee do
+  if Gitlab::Geo.geo_database_configured?
+    # Make sure connects_to for geo gets called outside of config/routes.rb first
+    # See InitializerConnections.with_disabled_database_connections
+    Geo::TrackingBase
+  end
+
   if Gitlab::Runtime.sidekiq? && Gitlab::Geo.geo_database_configured?
     # The Geo::TrackingBase model does not yet use connects_to. So,
     # this will not properly support geo: from config/databse.yml
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 7827ad8f168..6ad8b02bfea 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -39,7 +39,7 @@ Doorkeeper.configure do
 
   # Reuse access token for the same resource owner within an application (disabled by default)
   # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/383
-  reuse_access_token
+  # reuse_access_token
 
   # Issue access tokens with refresh token (disabled by default)
   use_refresh_token
diff --git a/config/initializers/enumerator_next_patch.rb b/config/initializers/enumerator_next_patch.rb
new file mode 100644
index 00000000000..e1fc04731ae
--- /dev/null
+++ b/config/initializers/enumerator_next_patch.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# Monkey patch of Enumerator#next to get better stack traces
+# when an error is raised from within a Fiber.
+# https://bugs.ruby-lang.org/issues/16829
+module EnumeratorNextPatch
+  %w(next next_values peek peek_values).each do |name|
+    define_method(name) do |*args|
+      gitlab_patch_backtrace_marker { super(*args) }
+    rescue Exception => err # rubocop: disable Lint/RescueException
+      err.set_backtrace(err.backtrace + caller) unless
+        has_gitlab_patch_backtrace_marker?(err.backtrace) && backtrace_matches_caller?(err.backtrace)
+
+      raise
+    end
+  end
+
+  private
+
+  def gitlab_patch_backtrace_marker
+    yield
+  end
+
+  # This function tells us whether the exception was generated by #next itself or by something in
+  # the Fiber that it invokes. If it's generated by #next, then the backtrace will have
+  # #gitlab_patch_backtrace_marker as the third item down the trace (since
+  # #gitlab_patch_backtrace_marker calls a block, which in turn calls #next.) If it's generated
+  # by the Fiber that #next invokes, then it won't contain this marker.
+  def has_gitlab_patch_backtrace_marker?(backtrace)
+    match = %r(^(.*):[0-9]+:in `gitlab_patch_backtrace_marker'$).match(backtrace[2])
+
+    !!match && match[1] == __FILE__
+  end
+
+  # This function makes sure that the rest of the stack trace matches in order to avoid missing
+  # an exception that was generated by calling #next on another Enumerator inside the Fiber.
+  # This might miss some *very* contrived scenarios involving recursion, but exceptions don't
+  # provide Fiber information, so it's the best we can do.
+  def backtrace_matches_caller?(backtrace)
+    backtrace[3..] == caller[1..]
+  end
+end
+
+Enumerator.prepend(EnumeratorNextPatch)
diff --git a/config/initializers/memory_watchdog.rb b/config/initializers/memory_watchdog.rb
new file mode 100644
index 00000000000..72779a18b10
--- /dev/null
+++ b/config/initializers/memory_watchdog.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+return unless Gitlab::Runtime.application?
+return unless Gitlab::Utils.to_boolean(ENV['GITLAB_MEMORY_WATCHDOG_ENABLED'])
+
+Gitlab::Cluster::LifecycleEvents.on_worker_start do
+  handler =
+    if Gitlab::Runtime.puma?
+      Gitlab::Memory::Watchdog::PumaHandler.new
+    elsif Gitlab::Runtime.sidekiq?
+      Gitlab::Memory::Watchdog::TermProcessHandler.new
+    else
+      Gitlab::Memory::Watchdog::NullHandler.instance
+    end
+
+  Gitlab::Memory::Watchdog.new(
+    handler: handler, logger: Gitlab::AppLogger
+  ).start
+end
diff --git a/config/initializers/peek.rb b/config/initializers/peek.rb
index 9662039e3eb..efd4594e64c 100644
--- a/config/initializers/peek.rb
+++ b/config/initializers/peek.rb
@@ -5,7 +5,10 @@ require 'peek/adapters/redis'
 Peek::Adapters::Redis.prepend ::Gitlab::PerformanceBar::RedisAdapterWhenPeekEnabled
 Peek.singleton_class.prepend ::Gitlab::PerformanceBar::WithTopLevelWarnings
 
-Rails.application.config.peek.adapter = :redis, { client: ::Redis.new(Gitlab::Redis::Cache.params) }
+Rails.application.config.peek.adapter = :redis, {
+  client: ::Redis.new(Gitlab::Redis::Cache.params),
+  expires_in: 5.minutes
+}
 
 Peek.into Peek::Views::Host
 Peek.into Peek::Views::ActiveRecord
diff --git a/config/initializers/rack_timeout.rb b/config/initializers/rack_timeout.rb
index c2f2f3e093c..27077f4f0f6 100644
--- a/config/initializers/rack_timeout.rb
+++ b/config/initializers/rack_timeout.rb
@@ -20,3 +20,7 @@ if Gitlab::Runtime.puma? && !Rails.env.test?
   observer = Gitlab::Cluster::RackTimeoutObserver.new
   Rack::Timeout.register_state_change_observer(:gitlab_rack_timeout, &observer.callback)
 end
+
+unless Gitlab::Utils.to_boolean(ENV['GITLAB_RAILS_RACK_TIMEOUT_ENABLE_LOGGING'], default: true)
+  Rack::Timeout::Logger.disable
+end
diff --git a/config/initializers/set_active_support_hash_digest_class.rb b/config/initializers/set_active_support_hash_digest_class.rb
deleted file mode 100644
index 743b45eed34..00000000000
--- a/config/initializers/set_active_support_hash_digest_class.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-Rails.application.configure do
-  # We set ActiveSupport::Digest.hash_digest_class directly copying
-  # See https://github.com/rails/rails/blob/6-1-stable/activesupport/lib/active_support/railtie.rb#L96-L98
-  #
-  # Note that is the only usage of config.active_support.hash_digest_class
-  config.after_initialize do
-    ActiveSupport::Digest.hash_digest_class = Gitlab::HashDigest::Facade
-  end
-end
diff --git a/config/initializers/wikicloth_redos_patch.rb b/config/initializers/wikicloth_redos_patch.rb
index 13180180c32..a0b7c2e2466 100644
--- a/config/initializers/wikicloth_redos_patch.rb
+++ b/config/initializers/wikicloth_redos_patch.rb
@@ -2,15 +2,22 @@
 
 require 'wikicloth'
 require 'wikicloth/wiki_buffer/var'
+require 'digest/sha2'
 
-# Adds patch for changes in this PR: https://github.com/nricciar/wikicloth/pull/112/files
+# Adds patch for changes in these PRs:
 #
-# That fix has already been merged, but the maintainers are not releasing new versions, so we
-# need to patch it here.
+# https://github.com/nricciar/wikicloth/pull/112
+# https://github.com/nricciar/wikicloth/pull/131
+#
+# The first fix has already been merged, but the second has not,
+# and the maintainers are not releasing new versions, so we
+# need to patch them here.
 #
 # If they ever do release a version, then we can remove this file.
 #
-# See: https://gitlab.com/gitlab-org/gitlab/-/issues/334056#note_745336618
+# See:
+# - https://gitlab.com/gitlab-org/gitlab/-/issues/334056#note_745336618
+# - https://gitlab.com/gitlab-org/gitlab/-/issues/361266
 
 # Guard to ensure we remember to delete this patch if they ever release a new version of wikicloth
 raise 'New version of WikiCloth detected, please remove this patch' unless Gem::Version.new(WikiCloth::VERSION) == Gem::Version.new('0.8.1')
@@ -30,9 +37,12 @@ raise 'New version of WikiCloth detected, please remove this patch' unless Gem::
 # rubocop:disable Layout/EmptyLineAfterGuardClause
 # rubocop:disable Performance/ReverseEach
 # rubocop:disable Style/BlockDelimiters
-# rubocop:disable Cop/LineBreakAroundConditionalBlock
 # rubocop:disable Layout/MultilineBlockLayout
 # rubocop:disable Layout/BlockEndNewline
+# rubocop:disable Style/PerlBackrefs
+# rubocop:disable Style/RegexpLiteralMixedPreserve
+# rubocop:disable Style/RedundantRegexpCharacterClass
+# rubocop:disable Performance/StringInclude
 module WikiCloth
   class WikiCloth
     def render(opt={})
@@ -110,7 +120,7 @@ module WikiCloth
           key = params[0].to_s.strip
           key_options = params[1..].collect { |p| p.is_a?(Hash) ? { :name => p[:name].strip, :value => p[:value].strip } : p.strip }
           key_options ||= []
-          key_digest = Digest::MD5.hexdigest(key_options.to_a.sort {|x,y| (x.is_a?(Hash) ? x[:name] : x) <=> (y.is_a?(Hash) ? y[:name] : y) }.inspect)
+          key_digest = Digest::SHA256.hexdigest(key_options.to_a.sort {|x,y| (x.is_a?(Hash) ? x[:name] : x) <=> (y.is_a?(Hash) ? y[:name] : y) }.inspect)
 
           return @options[:params][key] if @options[:params].has_key?(key)
           # if we have a valid cache fragment use it
@@ -138,6 +148,54 @@ module WikiCloth
       end
     end
   end
+
+  class WikiBuffer::HTMLElement < WikiBuffer
+    def to_html
+      if NO_NEED_TO_CLOSE.include?(self.element_name)
+        return "<#{self.element_name} />" if SHORT_TAGS.include?(self.element_name)
+        return "</#{self.element_name}><#{self.element_name}>" if @tag_check == self.element_name
+      end
+
+      if ESCAPED_TAGS.include?(self.element_name)
+        # remove empty first line
+        self.element_content = $1 if self.element_content =~ /^\s*\n(.*)$/m
+        # escape all html inside this element
+        self.element_content = self.element_content.gsub('<','&lt;').gsub('>','&gt;')
+        # hack to fix <code><nowiki> nested mess
+        self.element_content = self.element_content.gsub(/&lt;[\/]*\s*nowiki\s*&gt;/,'')
+      end
+
+      case self.element_name
+      when "template"
+        @options[:link_handler].cache({ :name => self.element_attributes["__name"], :content => self.element_content, :sha256 => self.element_attributes["__hash"] })
+        return self.element_content
+      when "noinclude"
+        return self.in_template? ? "" : self.element_content
+      when "includeonly"
+        return self.in_template? ? self.element_content : ""
+      when "nowiki"
+        return self.element_content
+      when "a"
+        if self.element_attributes['href'] =~ /:\/\//
+          return @options[:link_handler].external_link(self.element_attributes['href'], self.element_content)
+        elsif self.element_attributes['href'].nil? || self.element_attributes['href'] =~ /^\s*([\?\/])/
+          # if a element has no href attribute, or href starts with / or ?
+          return elem.tag!(self.element_name, self.element_attributes) { |x| x << self.element_content }
+        end
+      else
+        if Extension.element_exists?(self.element_name)
+          return Extension.html_elements[self.element_name][:klass].new(@options).instance_exec( self, &Extension.html_elements[self.element_name][:block] ).to_s
+        end
+      end
+
+      tmp = elem.tag!(self.element_name, self.element_attributes) { |x| x << self.element_content }
+      unless ALLOWED_ELEMENTS.include?(self.element_name)
+        tmp.gsub!(/[\-!\|&"\{\}\[\]]/) { |r| self.escape_char(r) }
+        return tmp.gsub('<', '&lt;').gsub('>', '&gt;')
+      end
+      tmp
+    end
+  end
 end
 # rubocop:enable Style/ClassAndModuleChildren
 # rubocop:enable Layout/SpaceAroundEqualsInParameterDefault
@@ -154,6 +212,9 @@ end
 # rubocop:enable Layout/EmptyLineAfterGuardClause
 # rubocop:enable Performance/ReverseEach
 # rubocop:enable Style/BlockDelimiters
-# rubocop:enable Cop/LineBreakAroundConditionalBlock
 # rubocop:enable Layout/MultilineBlockLayout
 # rubocop:enable Layout/BlockEndNewline
+# rubocop:enable Style/PerlBackrefs
+# rubocop:enable Style/RegexpLiteralMixedPreserve
+# rubocop:enable Style/RedundantRegexpCharacterClass
+# rubocop:enable Performance/StringInclude
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 233dca33bb8..56df8f93113 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -10,6 +10,9 @@ en:
         target: Target issue
       group:
         path: Group URL
+      namespace_setting:
+        unique_project_download_limit: "Number of projects"
+        unique_project_download_limit_interval_in_seconds: "Interval (seconds)"
       member:
         user: "The member's email address"
         invite_email: "The member's email address"
diff --git a/config/metrics/aggregates/common.yml b/config/metrics/aggregates/common.yml
index 0a9aec02b1a..6396187a26a 100644
--- a/config/metrics/aggregates/common.yml
+++ b/config/metrics/aggregates/common.yml
@@ -52,16 +52,6 @@
     - 'incident_management_incident_relate'
     - 'incident_management_incident_unrelate'
     - 'incident_management_incident_change_confidential'
-- name: i_testing_paid_monthly_active_user_total
-  operator: OR
-  source: redis
-  time_frame: [7d, 28d]
-  events:
-    - 'i_testing_web_performance_widget_total'
-    - 'i_testing_full_code_quality_report_total'
-    - 'i_testing_group_code_coverage_visit_total'
-    - 'i_testing_load_performance_widget_total'
-    - 'i_testing_metrics_report_widget_total'
 - name: xmau_plan
   operator: OR
   source: redis
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
diff --git a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
index 36097c13951..8abe9b7e66f 100644
--- a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_weekly
 description: Count of WAU editing an issue title
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml b/config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml
index 8c491bc24b1..fad71037d79 100644
--- a/config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml
+++ b/config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml
@@ -4,7 +4,7 @@ key_path: analytics_unique_visits.p_analytics_pipelines
 description: Unique visitors to /:group/:project/pipelines/charts
 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_7d/20210216174850_p_analytics_valuestream.yml b/config/metrics/counts_7d/20210216174850_p_analytics_valuestream.yml
index 0cb77ed4933..b575d7abf6d 100644
--- a/config/metrics/counts_7d/20210216174850_p_analytics_valuestream.yml
+++ b/config/metrics/counts_7d/20210216174850_p_analytics_valuestream.yml
@@ -4,7 +4,7 @@ key_path: analytics_unique_visits.p_analytics_valuestream
 description: Unique visitors to /:group/:project/-/value_stream_analytics
 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_7d/20210216174856_p_analytics_repo.yml b/config/metrics/counts_7d/20210216174856_p_analytics_repo.yml
index fc1fb3470db..dd1b09ead42 100644
--- a/config/metrics/counts_7d/20210216174856_p_analytics_repo.yml
+++ b/config/metrics/counts_7d/20210216174856_p_analytics_repo.yml
@@ -4,7 +4,7 @@ key_path: analytics_unique_visits.p_analytics_repo
 description: Unique visitors to /:group/:project/-/graphs/master/charts
 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_7d/20210216174858_i_analytics_cohorts.yml b/config/metrics/counts_7d/20210216174858_i_analytics_cohorts.yml
index 705cfefc5b5..27f8887cf9b 100644
--- a/config/metrics/counts_7d/20210216174858_i_analytics_cohorts.yml
+++ b/config/metrics/counts_7d/20210216174858_i_analytics_cohorts.yml
@@ -4,7 +4,7 @@ key_path: analytics_unique_visits.i_analytics_cohorts
 description: Unique visitors to /-/instance_statistics/cohorts
 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_7d/20210216174900_i_analytics_dev_ops_score.yml b/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
index 72db511d1e7..912386ac1c5 100644
--- a/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
+++ b/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
@@ -4,7 +4,7 @@ key_path: analytics_unique_visits.i_analytics_dev_ops_score
 description: Unique visitors to /-/instance_statistics/dev_ops_score
 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_7d/20210216174902_g_analytics_merge_request.yml b/config/metrics/counts_7d/20210216174902_g_analytics_merge_request.yml
index 0e726cfceae..a51c51fc6c2 100644
--- a/config/metrics/counts_7d/20210216174902_g_analytics_merge_request.yml
+++ b/config/metrics/counts_7d/20210216174902_g_analytics_merge_request.yml
@@ -4,7 +4,7 @@ key_path: analytics_unique_visits.g_analytics_merge_request
 description: Unique visitors to /groups/:group/-/analytics/merge_request_analytics
 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_7d/20210216174906_i_analytics_instance_statistics.yml b/config/metrics/counts_7d/20210216174906_i_analytics_instance_statistics.yml
index 06123553499..9a5109f436c 100644
--- a/config/metrics/counts_7d/20210216174906_i_analytics_instance_statistics.yml
+++ b/config/metrics/counts_7d/20210216174906_i_analytics_instance_statistics.yml
@@ -4,7 +4,7 @@ key_path: analytics_unique_visits.i_analytics_instance_statistics
 description: Unique visitors to/admin/usage_trends
 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_7d/20210216174908_analytics_unique_visits_for_any_target.yml b/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
index cdc7ee79752..9865183388f 100644
--- a/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
+++ b/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
@@ -4,7 +4,7 @@ key_path: analytics_unique_visits.analytics_unique_visits_for_any_target
 description: Unique visitors to any analytics feature by week
 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_7d/20210216175010_i_analytics_instance_statistics_weekly.yml b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
index c24d51412f8..eb85af4f7a0 100644
--- a/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
+++ b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.analytics.i_analytics_instance_statistics_weekly
 description: Unique visitors to /admin/usage_trends by week
 product_section: dev
 product_stage: manage
-product_group: group::optimize
+product_group: optimize
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
index 4efbc3f14de..09940ac08dd 100644
--- a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.analytics.analytics_total_unique_counts_weekly
 description: The number of unique users who visited any analytics feature by week
 product_section: dev
 product_stage: manage
-product_group: group::optimize
+product_group: optimize
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
index da938f35fa9..b513b694165 100644
--- a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.source_code.merge_request_action_weekly
 description: Count of unique users who perform an action on a merge request
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
index 6814b32f2bf..2db98f5087d 100644
--- a/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
+++ b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.source_code.i_source_code_code_intelligence_weekly
 description: Count of unique users who use code intelligence
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
index 57987f98ab6..29b224c7aa4 100644
--- a/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_mr_diffs_weekly
 description: Count of unique merge requests per week with diffs viewed
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
index 63a8442c4e6..55957fe4c4b 100644
--- a/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_single_file_diffs_we
 description: Count of unique users per week with diffs viewed file by file
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
index 2883082131e..bb698f7cad2 100644
--- a/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_mr_single_file_diffs_week
 description: Count of unique merge requests per week with diffs viewed file by file
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
index b7ceec20354..a1275a7bbeb 100644
--- a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_weekly
 description: Count of unique users per week who created a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
index dd0cef04ca9..5ec666df078 100644
--- a/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_close_mr_weekly
 description: Count of unique users per week who closed a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
index 3c79f72dd19..294a93a75d9 100644
--- a/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_reopen_mr_weekly
 description: Count of unique users per week who reopened a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
index ec5e7fbc032..7f2311f33ea 100644
--- a/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_merge_mr_weekly
 description: Count of unique users per week who merged a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
index d03ac5f1ef1..838fbf0e2d2 100644
--- a/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_comment_we
 description: Count of unique users per week 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_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
index 01b6ac1ee34..5510109edda 100644
--- a/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_edit_mr_comment_week
 description: Count of unique users per week who edited a comment on a MR
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
index 082cf4b5f0f..b55bb571bd2 100644
--- a/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_remove_mr_comment_we
 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_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml b/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
index a7faca5bc28..6d3aafa428a 100644
--- a/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
+++ b/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_add_suggestion_weekl
 description: Count of unique users per week 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_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml b/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
index d313eccb956..7f4931eb125 100644
--- a/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
+++ b/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_apply_suggestion_wee
 description: Count of unique users per week 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_7d/20210216180328_g_edit_by_web_ide_weekly.yml b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
index 74d8cf777af..cd1bf837b3f 100644
--- a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ide_edit.g_edit_by_web_ide_weekly
 description: Weekly number of users editing using 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_7d/20210216180332_g_edit_by_sfe_weekly.yml b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
index 8624ceac7d3..3995843b24a 100644
--- a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
+++ b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ide_edit.g_edit_by_sfe_weekly
 description: Weekly number of users editing 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_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
index 299237ec022..97e7b0b849e 100644
--- a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ide_edit.g_edit_by_snippet_ide_weekly
 description: Weekly number of users editing 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_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
index 00c19a06ab9..ef67ab7f11e 100644
--- a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ide_edit.ide_edit_total_unique_counts_weekly
 description: Weekly number of users editing a file using 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_7d/20210216180416_i_search_total.yml b/config/metrics/counts_7d/20210216180416_i_search_total.yml
index 82e2c0eceb3..e2bdc40d887 100644
--- a/config/metrics/counts_7d/20210216180416_i_search_total.yml
+++ b/config/metrics/counts_7d/20210216180416_i_search_total.yml
@@ -4,7 +4,7 @@ key_path: search_unique_visits.i_search_total
 description: Calculated unique users to perform Basic or Advanced searches by week
 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_7d/20210216180422_i_search_total_weekly.yml b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
index 2c02c296a85..01a2cdaee26 100644
--- a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
+++ b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.search.i_search_total_weekly
 description: Calculated unique users to perform Basic or Advanced searches by week
 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_7d/20210216180429_search_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
index 55170e41c2c..b3f32ed28c6 100644
--- a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.search.search_total_unique_counts_weekly
 description: Calculated unique users to perform Basic or Advanced searches by week
 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_7d/20210216180513_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
index 8501aca963d..eeb751682c7 100644
--- a/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
@@ -4,7 +4,7 @@ key_path: counts_weekly.aggregated_metrics.incident_management_alerts_total_uniq
 description: Count of unique users per week 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_7d/20210216180515_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
index 8e78722a377..6089b36401e 100644
--- a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
@@ -4,7 +4,7 @@ key_path: counts_weekly.aggregated_metrics.incident_management_incidents_total_u
 description: Count of unique users per week 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_7d/20210216180528_incident_management_alert_status_changed_weekly.yml b/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
index cffbc350343..faa01b2c14e 100644
--- a/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.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 per week
 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_7d/20210216180532_incident_management_alert_assigned_weekly.yml b/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
index bfc8fd42716..88aae8134a4 100644
--- a/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.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 week
 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_7d/20210216180535_incident_management_alert_todo_weekly.yml b/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
index 174c58230ca..56b27038a3e 100644
--- a/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.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 week
 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_7d/20210216180539_incident_management_incident_created_weekly.yml b/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
index 953c7962708..40b42fd1be4 100644
--- a/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_cr
 description: Count of unique users creating incidents  per week
 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_7d/20210216180543_incident_management_incident_reopened_weekly.yml b/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
index e7cac727367..8453a7bf93b 100644
--- a/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_re
 description: Count of unique users reopening incidents per week
 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_7d/20210216180546_incident_management_incident_closed_weekly.yml b/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
index 65780586fcc..ce7a34aaeb2 100644
--- a/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_cl
 description: Count of users closing incidents per week
 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_7d/20210216180550_incident_management_incident_assigned_weekly.yml b/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
index f7dc966bb72..192e78b2675 100644
--- a/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_as
 description: Count of unique users assiging incidents per week
 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_7d/20210216180554_incident_management_incident_todo_weekly.yml b/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
index d21ba880611..c15a71876c0 100644
--- a/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.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 week
 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_7d/20210216180558_incident_management_incident_comment_weekly.yml b/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
index f1f1ae465e6..5d7e5408466 100644
--- a/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_co
 description: Count of unique users adding comments on incidents per week
 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_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml b/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
index 45b0709bf25..763e713cc23 100644
--- a/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
+++ b/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_zo
 description: Count of unique users creating Zoom meetings about incidents per week
 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_7d/20210216180609_incident_management_incident_relate_weekly.yml b/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
index d0ef9bd6e52..263d2d60274 100644
--- a/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding issues per that are related to an inci
   week
 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_7d/20210216180612_incident_management_incident_unrelate_weekly.yml b/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
index 6755ffd46a6..3bd90957bb9 100644
--- a/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
+++ b/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users removing issue that are related to an inciden
   per week
 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_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml b/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
index 2c6efe436cb..9b7d216a18d 100644
--- a/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_ch
 description: Count of unique users changing incidents to confidential per week
 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_7d/20210216180620_incident_management_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
index f5d49e87d1c..6ad3e8e0c16 100644
--- a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_total_uniqu
 description: Count of unique users performing events related to the incident management
 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_7d/20210216180623_incident_management_alert_create_incident_weekly.yml b/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
index 24cd426e329..7abfc39fb41 100644
--- a/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
+++ b/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users per week 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_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
index 9c2fbc1b9ac..c630b1bad72 100644
--- a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_description_
 description: Count of WAU 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_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
index be1e250f443..afd7ac16acc 100644
--- a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_assignee_cha
 description: Count of WAU 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_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
index 49fa886e26f..4a7590fa63e 100644
--- a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_confide
 description: Count of WAU 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_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
index e8a0b4dea52..eae4cf74b4f 100644
--- a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
+++ b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_visible
 description: Count of WAU 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_7d/20210216181321_g_project_management_issue_created_weekly.yml b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
index 10a19c045cc..b59d309e25b 100644
--- a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_created_week
 description: Count of WAU creating 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_7d/20210216181324_g_project_management_issue_closed_weekly.yml b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
index 8b8348e479a..bce3c7466d5 100644
--- a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_closed_weekl
 description: Count of WAU 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_7d/20210216181328_g_project_management_issue_reopened_weekly.yml b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
index 36cfe848518..8e7f0a92086 100644
--- a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_reopened_wee
 description: Count of WAU 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_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
index 9a271f2a877..0a6436946a3 100644
--- a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_label_change
 description: Count of WAU 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_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
index 83a8c402c00..39909e9d2f6 100644
--- a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_milestone_ch
 description: Count of WAU 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_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
index d74794c08c7..1b20184f93f 100644
--- a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
+++ b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_cross_refere
 description: Count of WAU 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_7d/20210216181350_g_project_management_issue_moved_weekly.yml b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
index 0f344e64f41..1ef7e30cf80 100644
--- a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
+++ b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_moved_weekly
 description: Count of WAU moving an issue to another project
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
index 39ee0d124bd..7df346d1c0f 100644
--- a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
+++ b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_related_week
 description: Count of WAU 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_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
index 38606e53f88..e493200cb7e 100644
--- a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
+++ b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_unrelated_we
 description: Count of WAU 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_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
index 647e9504281..7609355ef9e 100644
--- a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_marked_as_du
 description: Count of WAU 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_7d/20210216181405_g_project_management_issue_locked_weekly.yml b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
index de8177bd331..04c1c33b614 100644
--- a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_locked_weekl
 description: Count of WAU 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_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
index e514429b22d..99a46162e24 100644
--- a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_unlocked_wee
 description: Count of WAU 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_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
index 86b6b48f6a8..6c54cda8cca 100644
--- a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_adde
 description: Count of WAU 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_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
index da25aafd304..50591b27826 100644
--- a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
+++ b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_modi
 description: Count of WAU 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_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
index 1ece28bef07..f25c8fab470 100644
--- a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_remo
 description: Count of WAU 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_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
index 048bc6955b4..8fc70434d77 100644
--- a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_due_date_cha
 description: Count of WAU 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_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
index a839582fd15..66313eadfb5 100644
--- a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_estimat
 description: Count of WAU changing an issue time estimate
 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_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
index f30fa4a93ac..2ad1a1fc35c 100644
--- a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_spent_c
 description: Count of WAU recording time spent 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_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
index bf575481220..ca24e7b8d2e 100644
--- a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_adde
 description: Count of WAU 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_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
index b1aa4e063ad..25d6d63f7b2 100644
--- a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_edit
 description: Count of WAU 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_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
index 1af96466839..a11431c52f3 100644
--- a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_remo
 description: Count of WAU 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_7d/20210216181459_g_project_management_issue_cloned_weekly.yml b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
index 6dd6c3db6c5..0421bd5e6f3 100644
--- a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
+++ b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_cloned_weekl
 description: Count of WAU 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_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
index ad741e44bb6..5863d5c6d33 100644
--- a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.issues_edit.issues_edit_total_unique_counts_weekly
 description: Aggregate count of WAU taking an action related to an issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
index 8a9121e954c..8ba9912367b 100644
--- a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
+++ b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_approve_weekly
 description: Count of WAU using the `/approve` quick action
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
index d89739ce6fc..ce8b74e809d 100644
--- a/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
+++ b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU 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_7d/20210216181517_i_quickactions_assign_self_weekly.yml b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
index dfc0547fbf3..e7a9da77a57 100644
--- a/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
+++ b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU 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_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
index 2482fa44596..2bb14fd86d6 100644
--- a/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU 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_7d/20210216181525_i_quickactions_award_weekly.yml b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
index f0a6f19180d..f30c48afe27 100644
--- a/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
+++ b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU 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_7d/20210216181529_i_quickactions_board_move_weekly.yml b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
index b036a1f2a9a..2fcfd76f2cf 100644
--- a/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_board_move_weekly
 description: Count of WAU using the `/board_move` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
index cb9ed4dd02f..56666aa5c27 100644
--- a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_clone_weekly
 description: Count of WAU using the `/clone` quick action to clone an issue.
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
index c2fbf0dfad1..5f66e29d64d 100644
--- a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
+++ b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_close_weekly
 description: Count of WAU using the `/close` quick action to close an issuable
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
index 952d089c404..7044ec1cee0 100644
--- a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU 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_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml b/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
index 66e0558593e..477b01fe58a 100644
--- a/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_merge_req
 description: Count of WAU using the `/copy_metadata` quick action on a Merge Request
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
index a55680b9a9f..ba3122f506f 100644
--- a/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_issue_wee
 description: Count of WAU using the `/copy_metadata` quick action on an issue
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
index 589f64cb96f..2cbaad8e195 100644
--- a/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_create_merge_request_we
 description: Count of WAU 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_7d/20210216181602_i_quickactions_done_weekly.yml b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
index 0d8379ef87c..20a148487ed 100644
--- a/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
+++ b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_done_weekly
 description: Count of WAU using the `/done` quick action to mark a todo as done
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
index 4722680c905..1862579b010 100644
--- a/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_draft_weekly
 description: Count of WAU using the `/draft` quick action on a Merge Request
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
index c1ab3be82a4..6d91df37fff 100644
--- a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
+++ b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU 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_7d/20210216181613_i_quickactions_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
index 86e7e3f5fe7..2aa366e6189 100644
--- a/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU 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_7d/20210216181620_i_quickactions_estimate_weekly.yml b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
index 148a58433f7..51a8b104c13 100644
--- a/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU 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_7d/20210216181628_i_quickactions_label_weekly.yml b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
index 9312c4cad2e..162ed402b2d 100644
--- a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
+++ b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_label_weekly
 description: Count of WAU using the `/label` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
index 619c94b117b..6f2cd99e56b 100644
--- a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_lock_weekly
 description: Count of WAU using the `/lock` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
index 6bacac4beb7..aaeda7d38c7 100644
--- a/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
+++ b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_merge_weekly
 description: Count of WAU using the `/merge` quick action
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
index 1db5048970d..5c9333b86cc 100644
--- a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_milestone_weekly
 description: Count of WAU using the `/milestone` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
index 00b5e9db85c..9b0298c05ef 100644
--- a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_move_weekly
 description: Count of WAU using the `/move` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
index 488f5dcd547..5f692ea8693 100644
--- a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
+++ b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_reassign_weekly
 description: Count of WAU using the `/reassign @user1` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
index be7648f6fc9..bebba3c9c16 100644
--- a/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_reassign_reviewer_weekl
 description: Count of WAU 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_7d/20210216181705_i_quickactions_rebase_weekly.yml b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
index fd68d75a7d1..332b4a9d49f 100644
--- a/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
+++ b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_rebase_weekly
 description: Count of WAU using the `/rebase` quick action on a Merge Request
 product_section: dev
 product_stage: source_code
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
index d25540e9127..30b34915504 100644
--- a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
+++ b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_relabel_weekly
 description: Count of WAU using the `/relabel` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
index 6114b6340da..0676a68294c 100644
--- a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_relate_weekly
 description: Count of WAU using the `/relate` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
index b0fe3966750..851221e77a5 100644
--- a/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
+++ b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_remove_due_date_weekly
 description: Count of WAU using the `/remove_due_date` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
index 181533aa209..c61ef9beb0d 100644
--- a/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_remove_estimate_weekly
 description: Count of WAU using the `/remove_estimate` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: time_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
index fa4c059c8a3..6b27c442b53 100644
--- a/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_remove_milestone_weekly
 description: Count of WAU using the `/remove_milestone` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
index 884c0b82e08..5e8b08a8b2f 100644
--- a/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
+++ b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_remove_time_spent_weekl
 description: Count of WAU 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_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
index 5bace9a2061..1286451c093 100644
--- a/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_remove_zoom_weekly
 description: Count of WAU using the `/remove_zoom` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
index fe59955bc03..30230076606 100644
--- a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
+++ b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_reopen_weekly
 description: Count of WAU using the `/reopen` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
index 7e984753739..6dea3beeffb 100644
--- a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
+++ b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_shrug_weekly
 description: Count of WAU using the `/shrug` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
index 7225a40b37b..747db90fc0c 100644
--- a/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
+++ b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_spend_subtract_weekly
 description: Count of WAU using the `/spend` quick action to subtract time spent
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: time_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
index 5cc536093c5..f0ef4fc1443 100644
--- a/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
+++ b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_spend_add_weekly
 description: Count of WAU using the `/spend` quick action to add time spent
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml b/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
index 9a70b3d8e26..d59582d77a4 100644
--- a/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
+++ b/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_submit_review_weekly
 description: Count of WAU using the `/submit_review` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
index aeffa97de1f..45f12337aed 100644
--- a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_subscribe_weekly
 description: Count of WAU using the `/subscribe` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
index 0b2d759771a..2496a625ba4 100644
--- a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_tableflip_weekly
 description: Count of WAU using the `/tableflip` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
index d7073ac8378..8fa970a825c 100644
--- a/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
+++ b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_tag_weekly
 description: Count of WAU using the `/tag` quick action
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml b/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
index 6741280b2e4..1cacf957c29 100644
--- a/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
+++ b/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_target_branch_weekly
 description: Count of WAU using the `/target_branch` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
index 30b60d472ff..7ed0c90fe63 100644
--- a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_title_weekly
 description: Count of WAU using the `/title` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
index 1752c3a4fd4..e626eb20f0e 100644
--- a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_todo_weekly
 description: Count of WAU using the `/todo` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml b/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
index fe8532e5e47..c15a1a910e1 100644
--- a/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
+++ b/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_unassign_specific_weekl
 description: Count of WAU using the `/unassign @user1` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml b/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
index c9b473cc2de..ade389e3109 100644
--- a/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
+++ b/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_unassign_all_weekly
 description: Count of WAU using the `/unassign` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
index 8b3be77a180..df8989017e4 100644
--- a/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU 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_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
index 1725a41355f..f9bcdfae4e0 100644
--- a/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
+++ b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU 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_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
index 314d0520116..0b85ab538d8 100644
--- a/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
+++ b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_all_weekly
 description: Count of WAU using the `/unlabel` quick action to remove all labels
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
index e43a93bcb14..e0954fdb822 100644
--- a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_unlock_weekly
 description: Count of WAU using the `/unlock` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
index 02d944eca4f..a8c7c6d7f4a 100644
--- a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_unsubscribe_weekly
 description: Count of WAU using the `/unsubscribe` quick action
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
index c5d3ed1a478..b041898637a 100644
--- a/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_wip_weekly
 description: Count of WAU using the `/wip` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
index 5f60ce53ab5..6591335ab5c 100644
--- a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_zoom_weekly
 description: Count of WAU using the `/zoom` quick action on Issues
 product_section: dev
 product_stage: plan
-product_group: group::project management
+product_group: project_management
 product_category: issue_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
index 550d825a1e8..20bc1976170 100644
--- a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.source_code.wiki_action_weekly
 description: Count of unique actions done on a wiki (create, edit, delete)
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
index 75b340a8ad5..b80ec9236a2 100644
--- a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.source_code.design_action_weekly
 description: Count of total design actions (upload, delete, comment, reply)
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
index 21f857dac99..7ecc4a9ffaa 100644
--- a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182107_project_action_weekly.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_7d/20210216182134_i_testing_test_case_parsed_weekly.yml b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
index 1dd4cc50c09..49d882f893b 100644
--- a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
+++ b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
@@ -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_7d/20210216183213_product_analytics_test_metrics_union.yml b/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
index 98bcd975333..6d7b16b9f3d 100644
--- a/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
+++ b/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: counts_weekly.aggregated_metrics.product_analytics_test_metrics_union
 description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
+product_section: analytics
+product_stage: analytics
+product_group: product_intelligence
 product_category: collection
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
index bfd8f27de07..46295dcdb00 100644
--- a/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
+++ b/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: counts_weekly.aggregated_metrics.product_analytics_test_metrics_intersection
 description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
+product_section: analytics
+product_stage: analytics
+product_group: product_intelligence
 product_category: collection
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
index d0e3ac2ceb3..25deb6b9c3b 100644
--- a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
+++ b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ide_edit.g_edit_by_sse_weekly
 description: Weekly number of users editing 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_7d/20210216184045_git_write_action_weekly.yml b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
index 7c49c843167..66811db0a95 100644
--- a/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.source_code.git_write_action_weekly
 description: Count of unique Git write actions
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
index 7fd1d24d098..3b84b959cdc 100644
--- a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
+++ b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.snippets.i_snippets_show_weekly
 description: Weekly 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_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml b/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
index bb33cc5bed5..885f408188f 100644
--- a/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
+++ b/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.terraform.p_terraform_state_api_unique_users_weekly
 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_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml b/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
index eaf4f7780cd..795acd44f85 100644
--- a/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
+++ b/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_user
 description: Weekly unique user count doing commits 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_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
index 78d489712bb..a84d38cc106 100644
--- a/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
+++ b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_toggled_task_item_status_weekly
 description: Count of unique users per week who toggled a task item in a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
index 50a616d3156..2b013d9bd6f 100644
--- a/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approve_mr_weekly
 description: Count of unique users per week who approve a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
index 341178587c9..cb199460b56 100644
--- a/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_unapprove_mr_weekly
 description: Count of unique users per week who unapprove a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
index bb80932f86b..a4793165d84 100644
--- a/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
+++ b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_resolve_thread_weekly
 description: Count of unique users per week who resolve a thread in a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
index 1d91fa77e0c..2f7a8f95e60 100644
--- a/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
+++ b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_unresolve_thread_weekly
 description: Count of unique users per week who unresolve a thread in a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
index bb2ebfc942b..f274a3c84ee 100644
--- a/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_edit_mr_title_weekly
 description: Count of unique users per week who edit the title of a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
index 64de1c4ef82..a33decb9829 100644
--- a/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
+++ b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_edit_mr_desc_weekly
 description: Count of unique users per week who edit the description of a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
index 731c07d4fad..2f973ca280c 100644
--- a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
+++ b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_create_review_note_w
 description: Count of unique users per week who create a note as part of a merge request
   review
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
index d036350ef9d..12ab4d9e142 100644
--- a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
+++ b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_publish_review_weekl
 description: Count of unique users per week who publish their review as part of a
   merge request review
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
index b90e46a5cd8..42350e2ed46 100644
--- a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_create_multiline_mr_
 description: Count of unique users per week who create a multiline comment in a merge
   request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
index 5efcda783ff..e97a2d484a0 100644
--- a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
@@ -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_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
index 71f051f10ee..c3116458680 100644
--- a/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_remove_multiline_mr_
 description: Count of unique users per week who remove a multiline comment in a merge
   request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
index 2bef437e3d0..72a1a0d27cb 100644
--- a/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_assigned_weekly
 description: Count of unique users per week who are assigned to a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
index 28bfd16ef6f..523df4fc166 100644
--- a/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_marked_as_draft_weekly
 description: Count of unique users per week who mark a merge request as a draft
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_section: 'TBD'
 product_category: code_review
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
index 4c2944cf0c1..85e3cb7fa2e 100644
--- a/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_unmarked_as_draft_weekly
 description: Count of unique users per week who unmark a merge request as a draft
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
index 57381e15a19..d38e248ab3d 100644
--- a/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
+++ b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_review_requested_weekly
 description: Count of unique users per week who request a review of a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
index b38faa983c7..3528cc2cdf5 100644
--- a/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_added_weekly
 description: Count of unique users per week who add an approval rule to a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
index 02fe4cc5993..5745700f3b4 100644
--- a/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
+++ b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_delete
 description: Count of unique users per week who delete an approval rule to a merge
   request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
index 58b569521bb..42b67c04587 100644
--- a/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_edited_weekly
 description: Count of unique users per week who edit an approval rule to a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
index 3e3668df67d..4dbf661eaa0 100644
--- a/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_vs_code_api_request_weekly
 description: Count of unique users per week who use GitLab Workflow for VS Code
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: editor_extension
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
index 7cf0936e79f..4e7bd44586c 100644
--- a/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_from_issue_weekly
 description: Count of unique users per week who create a merge request from an issue
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
index eb62bf37a70..ab39318eb0d 100644
--- a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: redis_hll_counters.code_review.code_review_total_unique_counts_weekly
 description: Count of unique users per week who interact with a merge request
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
diff --git a/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml b/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
index a6db13c8904..e00e435cf88 100644
--- a/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
+++ b/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_we
 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: active
diff --git a/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml b/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
index 9bec574722c..3a522e9088e 100644
--- a/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
+++ b/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.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_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml b/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
index ec176ce689c..71ceb5f2b1c 100644
--- a/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.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_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml b/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
index b5d9e4f7992..a9cc39612a2 100644
--- a/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
+++ b/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.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_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml b/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
index c7673adedfd..3d65b0c40e2 100644
--- a/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
+++ b/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.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_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
index 050ad56eb91..e6f8be30ffc 100644
--- a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
+++ b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_we
 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_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml b/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
index 606fed4b823..d3e606940ea 100644
--- a/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
+++ b/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_weekly
 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: active
diff --git a/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
index 0477d58a5d8..5ef3202e2b7 100644
--- a/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
@@ -5,7 +5,7 @@ description: Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.
   template in last 7 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_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
index f5e03b1fbcb..2cbe1cf6e69 100644
--- a/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
@@ -5,7 +5,7 @@ description: Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in
   7 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_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml b/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
index 408c03894fd..64ed870d8ef 100644
--- a/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_week
 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_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
index d7278e2dd34..681c013a387 100644
--- a/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.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_7d/20210216184544_p_ci_templates_security_sast_weekly.yml b/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
index 07fa0b9ca40..e1898c66232 100644
--- a/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
+++ b/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_security_sast_weekly
 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_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml b/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
index d73981915e1..e10586708bd 100644
--- a/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
+++ b/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.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_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml b/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
index d17d8c10e55..103bb221b98 100644
--- a/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_base_latest_w
 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_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
index a3696ba0098..aa25ab379b9 100755
--- a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.ci_templates_total_unique_counts_weekl
 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_7d/20210216184801_quickactions_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
index e4826e6575c..f66f4acd853 100644
--- a/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.quickactions_total_unique_counts_weekl
 description: Count of WAU 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_7d/20210216184805_i_package_composer_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
index 4238901ee7f..d4bca957360 100644
--- a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
@@ -5,7 +5,7 @@ description: A weekly count of Composer 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_7d/20210216184808_i_package_conan_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
index f2c52f8b08a..8c312a52af0 100644
--- a/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
@@ -5,7 +5,7 @@ description: A weekly 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_7d/20210216184812_i_package_container_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
index 5e724cef1b7..5e56465dbd4 100644
--- a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
@@ -5,7 +5,7 @@ description: A weekly 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_7d/20210216184816_i_package_debian_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
index 6f190f6b4ec..828e3662601 100644
--- a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
@@ -5,7 +5,7 @@ description: A weekly count of Debian 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: removed
diff --git a/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
index 02bc59f30d8..6233c2339de 100644
--- a/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
@@ -5,7 +5,7 @@ description: A weekly 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_7d/20210216184824_i_package_golang_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
index 00103711910..3df457db03b 100644
--- a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
@@ -5,7 +5,7 @@ description: A weekly count of Go modules published to the registry using a depl
   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_7d/20210216184828_i_package_maven_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
index e4edfff33a7..8485e4013f3 100644
--- a/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
@@ -5,7 +5,7 @@ description: A weekly 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_7d/20210216184832_i_package_npm_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
index 95e1f413b12..7d8c3585aa2 100644
--- a/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
@@ -5,7 +5,7 @@ description: A weekly count of npm packages published to the registry using a de
   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_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
index 55d3a87db45..f2a0460bc27 100644
--- a/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
@@ -5,7 +5,7 @@ description: A weekly 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_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
index 14c71a5ab70..a0c74b4f002 100644
--- a/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
@@ -5,7 +5,7 @@ description: A weekly count of Python 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_7d/20210216184844_i_package_tag_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
index 9b8ca1c5d7c..27863bdde3d 100644
--- a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
@@ -5,7 +5,7 @@ description: A weekly count of users that have published a package tag to the re
   using a 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_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
index 4a90ff637d6..671b8a1785a 100644
--- a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.deploy_token_packages.deploy_token_packages_total_u
 description: A weekly count of packages published to the registry using 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_7d/20210216184852_i_package_composer_user_weekly.yml b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
index 8ffcc7acc57..85bacdd8f17 100644
--- a/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
@@ -5,7 +5,7 @@ description: A weekly count of users that have published a Composer 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_7d/20210216184856_i_package_conan_user_weekly.yml b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
index dbca15deac9..78e2ad69fe8 100644
--- a/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_conan_user_weekly
 description: A weekly 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_7d/20210216184900_i_package_container_user_weekly.yml b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
index abd37cd02d6..3ecf501dc1b 100644
--- a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
@@ -5,7 +5,7 @@ description: A weekly count of users that have published a container image to th
   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_7d/20210216184904_i_package_debian_user_weekly.yml b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
index 29aabf7a7fa..e71927d20ee 100644
--- a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_debian_user_weekly
 description: A weekly count of users that have published a Debian 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: removed
diff --git a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
index d529d1c2f38..fe0b86aaa07 100644
--- a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
@@ -5,7 +5,7 @@ description: A weekly count of users that have published a generic 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: active
diff --git a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
index 75437f7e174..cfda35c0968 100644
--- a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_golang_user_weekly
 description: A weekly count of users that have published a Go module 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_7d/20210216184916_i_package_maven_user_weekly.yml b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
index 170c03065e5..fabc6d05016 100644
--- a/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_maven_user_weekly
 description: A weekly 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_7d/20210216184919_i_package_npm_user_weekly.yml b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
index 6f340c74ae9..f48c0a9a506 100644
--- a/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_npm_user_weekly
 description: A weekly 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_7d/20210216184923_i_package_nuget_user_weekly.yml b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
index ff0c7edfe44..bd4b8b006ec 100644
--- a/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_nuget_user_weekly
 description: A weekly 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_7d/20210216184927_i_package_pypi_user_weekly.yml b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
index 9d227bf4d9e..5c52ee9137d 100644
--- a/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_pypi_user_weekly
 description: A weekly count of users that have published a Python 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_7d/20210216184931_i_package_tag_user_weekly.yml b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
index 976ca5febe1..b934af222a8 100644
--- a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
@@ -5,7 +5,7 @@ description: A weekly count of users that have published a package with a tag to
   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_7d/20210216184935_user_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
index 1bd4181f952..81181baa4ee 100644
--- a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.user_packages_total_unique_counts_wee
 description: A weekly 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_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
index 33004c0a8a8..2b433855670 100644
--- a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_close_issue_week
 description: Number of users closing Jira issues by week
 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_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
index 193fe8cef3a..aa3c99eab67 100644
--- a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
+++ b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.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 week
 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_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
index 6f1332ca69e..513b3ba1f5e 100644
--- a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.ecosystem_total_unique_counts_weekly
 description: Number of users performing actions on Jira issues by week
 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_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml b/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
index a9622709a20..6ea3c5d8e46 100644
--- a/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
+++ b/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_user
 description: Weekly 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_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
index 343f01e8223..fac4c52904a 100644
--- a/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
@@ -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 week
 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_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
index ae24bce7880..78f3c6d3d4a 100644
--- a/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_time_estimate_change
 description: Count of unique users per week 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_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
index 1f184726f6e..6a5f5914ded 100644
--- a/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_time_spent_changed_w
 description: Count of unique users per week 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_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
index 7dc1fef5996..bac63e461c9 100644
--- a/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
@@ -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 week
 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_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
index 7c5df5c4d30..30ee2e05a18 100644
--- a/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
@@ -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 week
 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_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
index 1ff2ae4bfbe..54ff97eeb13 100644
--- a/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
@@ -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 week
 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_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
index 0d5259cd109..4a2a99f8282 100644
--- a/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
@@ -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 week
 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_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
index 502633cf2e4..559940a3be9 100644
--- a/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
@@ -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 week
 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_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
index 462e3a936bd..a029e1b30c4 100644
--- a/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
@@ -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 week
 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_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
index ed317741522..b278b731c7d 100644
--- a/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
@@ -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 week
 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_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
index 7f3ec3d463e..fe0a2011392 100644
--- a/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
@@ -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 week
 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_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml b/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
index 0ab35b83efb..a5f45d5ca39 100644
--- a/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
+++ b/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_mr_discussion_unlock
 description: Count of unique users per week 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_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml b/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
index 05850bd0ecf..06b61434043 100644
--- a/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_mr_discussion_locked
 description: Count of unique users per week 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_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
index d0becbb1f82..09d2a58fa35 100644
--- a/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_milestone_changed_we
 description: Count of unique users per week 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_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml b/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
index 84102e9d620..fc28f4ee95f 100644
--- a/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_labels_changed_weekl
 description: Count of unique users per week 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_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml b/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
index 7be4524a57e..687100f1572 100644
--- a/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_assignees_changed_we
 description: Count of unique users per week 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_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml b/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
index 9f7603e1669..9b8f57680e6 100644
--- a/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_reviewers_changed_we
 description: Count of unique users per week 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_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml b/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
index 6668773a8a1..84c514f2b4c 100644
--- a/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
+++ b/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_invite_email_single_wee
 description: Unique users using the /invite_email quick action to add a single email participant to an issue within 7 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_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml b/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
index 4e395cbaa75..b4085cc431b 100644
--- a/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
+++ b/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_invite_email_multiple_w
 description: Unique users using the /invite_email quick action to add a multiple email participants to an issue within 7 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_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml b/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
index dcbe3878463..4e22dafd1a2 100644
--- a/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.deploy_token_packages.i_package_rubygems_deploy_tok
 description: A weekly count of distinct RubyGems packages published using 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_7d/20210303154652_i_package_rubygems_user_weekly.yml b/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
index e8871c1868e..5fafa692102 100644
--- a/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
+++ b/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_rubygems_user_weekly
 description: A weekly count of distinct RubyGems packages published by a user
 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_7d/20210409095855_users_expanding_secure_security_report_weekly.yml b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
index ebe67adad33..41948e72b14 100644
--- a/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.secure.users_expanding_secure_security_report_weekl
 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_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
index 2a26794ed92..a8686e59e13 100644
--- a/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
@@ -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_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
index 87e8873ed00..bbad1715f98 100644
--- a/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
@@ -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_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
index 8325cb2620d..51cb976a888 100644
--- a/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
@@ -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 7 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_7d/20210410012209_i_package_terraform_module_user_weekly.yml b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
index 90a8a3bad22..ad5002fe9b9 100644
--- a/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
+++ b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_terraform_module_user_weekl
 description: Number of distinct users creating Terraform Module packages in recent 7 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_7d/20210413205507_i_testing_summary_widget_total_weekly.yml b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
index 2b378da8347..f9c34ab4fe9 100644
--- a/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
+++ b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.i_testing_summary_widget_total_weekly
 description: Unique users that expand the test summary merge request widget by week
 product_section: ops
 product_stage: verify
-product_group: group::pipeline insights
+product_group: pipeline_insights
 product_category: testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml b/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
index 027fd5d31d7..2822bc33d13 100644
--- a/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
@@ -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_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml b/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
index 76a53ef1b37..8e23a2aae8f 100644
--- a/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_click_file_browser_settin
 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_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml b/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
index 7d3f82bfbaf..6a127785a51 100644
--- a/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
@@ -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_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml b/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
index 8e12608620d..e63400107c8 100644
--- a/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
+++ b/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_diff_view_inline_weekly
 description: Count of users with merge request view type as inline
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml b/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
index bcef87a890b..2968d582466 100644
--- a/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
+++ b/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_diff_view_parallel_weekly
 description: Count of users with merge request view type as parallel
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml b/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
index 1a2e4fcf83e..62fb89aa5c5 100644
--- a/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
+++ b/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_file_browser_tree_view_we
 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_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml b/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
index 813641cb82d..ea0d1039057 100644
--- a/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
+++ b/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_file_browser_list_view_we
 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_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml b/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
index f11db5ceacd..0b791d84552 100644
--- a/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
+++ b/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_diff_show_whitespace_week
 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_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml b/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
index c2282fc9bc3..f5ab68f120f 100644
--- a/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
+++ b/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_diff_hide_whitespace_week
 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_7d/20210422102118_i_code_review_diff_single_file_weekly.yml b/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
index 32318d1c4ff..613368825ec 100644
--- a/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
+++ b/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_diff_single_file_weekly
 description: Count of users with single file mode enabled
 product_section: dev
 product_stage: create
-product_group: group::code review
+product_group: code_review
 product_category: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml b/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
index e83bd92cfd3..6eb1c55d098 100644
--- a/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
+++ b/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_diff_multiple_files_weekl
 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_7d/20210423005644_i_analytics_dev_ops_adoption.yml b/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
index b79b021901c..02d537394f4 100644
--- a/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
+++ b/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
@@ -4,7 +4,7 @@ key_path: analytics_unique_visits.i_analytics_dev_ops_adoption
 description: Unique users viewing analytics devops adoption
 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_7d/20210427103328_code_review_group_monthly_active_users.yml b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
index 1143a233e85..bb909bd10b2 100644
--- a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
@@ -4,7 +4,7 @@ key_path: counts_weekly.aggregated_metrics.code_review_group_monthly_active_user
 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_7d/20210427103407_code_review_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
index 96490623d95..ce6093ed7fc 100644
--- a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
@@ -4,7 +4,7 @@ key_path: counts_weekly.aggregated_metrics.code_review_category_monthly_active_u
 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_7d/20210427103452_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
index d452a7d2c28..0ca1e03ab11 100644
--- a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
@@ -4,7 +4,7 @@ key_path: counts_weekly.aggregated_metrics.code_review_extension_category_monthl
 description: Number of users performing code review extension_category 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_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
index fcaeed5faf6..1439c31a1cb 100644
--- a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
@@ -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_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml b/config/metrics/counts_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml
index 2f5415c7802..378637ab14b 100644
--- a/config/metrics/counts_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml
+++ b/config/metrics/counts_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml
@@ -5,7 +5,7 @@ name: unique_users_viewing_analytics_group_devops_adoption
 description: Unique users viewing analytics group devops adoption
 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_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml b/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
index a8449bad161..5e5f8012a25 100644
--- a/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
+++ b/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
@@ -5,7 +5,7 @@ name: load_conflict_ui
 description: Count of unique users per week who load the conflict resolution page
 product_section: 'TBD'
 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_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml b/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
index b25ed55bae1..be7905f3908 100644
--- a/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
+++ b/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
@@ -5,7 +5,7 @@ name: resolve_conflict
 description: Count of unique users per week who attempt to resolve a conflict through the ui
 product_section: 'TBD'
 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_7d/20210517074851_i_package_helm_deploy_token_weekly.yml b/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
index 80ed666e376..48a6f7b6f80 100644
--- a/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.deploy_token_packages.i_package_helm_deploy_token_w
 description: Distinct Helm pakages deployed in recent 7 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_7d/20210517075252_i_package_helm_user_weekly.yml b/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
index a3aede72682..2b144ddfea5 100644
--- a/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
+++ b/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_helm_user_weekly
 description: Distinct user count events for Helm packages in recent 7 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_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml b/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
index 01ff67560ba..9b8408c193a 100644
--- a/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.code_review.i_code_review_click_diff_view_setting_w
 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_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml b/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml
index 18a5f85d719..4f96db892f6 100644
--- a/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml
+++ b/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.code_review.i_code_review_user_searches_diff_weekly
 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_7d/20210721042223_i_quickactions_severity_weekly.yml b/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
index abce1f1b04b..68bae7212c5 100644
--- a/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
+++ b/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_severity_weekly
 description: Count of WAU 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_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml b/config/metrics/counts_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml
index 4460136d6fa..485ad63052e 100644
--- a/config/metrics/counts_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml
+++ b/config/metrics/counts_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml
@@ -4,7 +4,7 @@ name: "count_notes_with_suggestions_weekly"
 description: Total number of weekly 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_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml b/config/metrics/counts_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml
index 9388bad2024..fa2952320ef 100644
--- a/config/metrics/counts_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml
+++ b/config/metrics/counts_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml
@@ -4,7 +4,7 @@ name: "count_notes_with_applied_suggestions_weekly"
 description: Total number of weekly 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_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml
index beb82977e3f..9afd7e8e3f8 100644
--- a/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_de
 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_7d/20210902191054_i_quickactions_unapprove_weekly.yml b/config/metrics/counts_7d/20210902191054_i_quickactions_unapprove_weekly.yml
index b3a4699307e..bba2b2bcfaf 100644
--- a/config/metrics/counts_7d/20210902191054_i_quickactions_unapprove_weekly.yml
+++ b/config/metrics/counts_7d/20210902191054_i_quickactions_unapprove_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_unapprove_weekly
 description: Count of WAU 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_7d/20210908151645_i_code_review_user_resolve_thread_in_issue_weekly.yml b/config/metrics/counts_7d/20210908151645_i_code_review_user_resolve_thread_in_issue_weekly.yml
index c9d0c92194b..7fdce381a55 100644
--- a/config/metrics/counts_7d/20210908151645_i_code_review_user_resolve_thread_in_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210908151645_i_code_review_user_resolve_thread_in_issue_weekly.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 weekly
 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_7d/20210916102312_templates_gitlab_slack_application_active.yml b/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml
index 27e0505c2cd..d1021ed4c0b 100644
--- a/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml
@@ -4,7 +4,7 @@ name: count_templates_gitlab_slack_application_active
 description: Count templates with active slack application
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml b/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml
index fb065ffe3b1..4d75becbbc3 100644
--- a/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml
+++ b/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.importer.github_import_project_start_weekly
 description: The number of github projects that were enqueued to start weekly
 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_7d/20210930130525_github_import_project_success_weekly.yml b/config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml
index 887dc2565dc..19188213132 100644
--- a/config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml
+++ b/config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.importer.github_import_project_success_weekly
 description: The number of github projects that were successful weekly
 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_7d/20210930163807_github_import_project_failure_weekly.yml b/config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml
index c4ffb079c38..db77985ad5e 100644
--- a/config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml
+++ b/config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.importer.github_import_project_failure_weekly
 description: The number of github projects that failed weekly
 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_7d/20211015154445_p_ci_templates_kaniko_weekly.yml b/config/metrics/counts_7d/20211015154445_p_ci_templates_kaniko_weekly.yml
index f101eefc933..0234ff62765 100644
--- a/config/metrics/counts_7d/20211015154445_p_ci_templates_kaniko_weekly.yml
+++ b/config/metrics/counts_7d/20211015154445_p_ci_templates_kaniko_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_kaniko_weekly
 description: ''
 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_7d/20211102141244_i_quickactions_promote_to_incident_weekly.yml b/config/metrics/counts_7d/20211102141244_i_quickactions_promote_to_incident_weekly.yml
index a3ca5d70089..ee086b844cc 100644
--- a/config/metrics/counts_7d/20211102141244_i_quickactions_promote_to_incident_weekly.yml
+++ b/config/metrics/counts_7d/20211102141244_i_quickactions_promote_to_incident_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_promote_to_incident_wee
 description: Count of WAU 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_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml
index 4fb9a64a234..371e684e406 100644
--- a/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml
@@ -4,7 +4,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_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml
index 09070adb2c1..fd4b22fd1e5 100644
--- a/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.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_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml
index 3fdd37bffa5..5b419846d35 100644
--- a/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_iac_latest_we
 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_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml
index 3a58cd033f2..9b71c66ca77 100644
--- a/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.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_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml b/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml
index 3a647c52f71..7e1e436142a 100644
--- a/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml
+++ b/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.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_7d/20211109114948_i_quickactions_add_contacts_weekly.yml b/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml
index 356d969cea5..cfab4e79963 100644
--- a/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml
+++ b/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_add_contacts_weekly
 description: Count of WAU 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_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml b/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml
index 7a660ddffd2..81c0740dba6 100644
--- a/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml
+++ b/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_remove_contacts_weekly
 description: Count of WAU 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_7d/20211111162058_i_code_review_post_merge_delete_branch_weekly.yml b/config/metrics/counts_7d/20211111162058_i_code_review_post_merge_delete_branch_weekly.yml
index f6cd1f6a86b..78a318cba53 100644
--- a/config/metrics/counts_7d/20211111162058_i_code_review_post_merge_delete_branch_weekly.yml
+++ b/config/metrics/counts_7d/20211111162058_i_code_review_post_merge_delete_branch_weekly.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_7d/20211111162417_i_code_review_post_merge_click_revert_weekly.yml b/config/metrics/counts_7d/20211111162417_i_code_review_post_merge_click_revert_weekly.yml
index 70f968fcc0e..6a687646417 100644
--- a/config/metrics/counts_7d/20211111162417_i_code_review_post_merge_click_revert_weekly.yml
+++ b/config/metrics/counts_7d/20211111162417_i_code_review_post_merge_click_revert_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.code_review.i_code_review_post_merge_click_revert_w
 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_7d/20211112102440_i_code_review_post_merge_click_cherry_pick_weekly.yml b/config/metrics/counts_7d/20211112102440_i_code_review_post_merge_click_cherry_pick_weekly.yml
index 90428f31a7a..a6221b0a1dc 100644
--- a/config/metrics/counts_7d/20211112102440_i_code_review_post_merge_click_cherry_pick_weekly.yml
+++ b/config/metrics/counts_7d/20211112102440_i_code_review_post_merge_click_cherry_pick_weekly.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_7d/20211112114327_i_code_review_post_merge_submit_revert_modal_weekly.yml b/config/metrics/counts_7d/20211112114327_i_code_review_post_merge_submit_revert_modal_weekly.yml
index ea7238e9913..4761f07cf17 100644
--- a/config/metrics/counts_7d/20211112114327_i_code_review_post_merge_submit_revert_modal_weekly.yml
+++ b/config/metrics/counts_7d/20211112114327_i_code_review_post_merge_submit_revert_modal_weekly.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_7d/20211112115138_i_code_review_post_merge_submit_cherry_pick_modal_weekly.yml b/config/metrics/counts_7d/20211112115138_i_code_review_post_merge_submit_cherry_pick_modal_weekly.yml
index ac8649eef80..344f60897bd 100644
--- a/config/metrics/counts_7d/20211112115138_i_code_review_post_merge_submit_cherry_pick_modal_weekly.yml
+++ b/config/metrics/counts_7d/20211112115138_i_code_review_post_merge_submit_cherry_pick_modal_weekly.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_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml b/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
index e77af4df59a..ead9799711b 100644
--- a/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
+++ b/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.analytics.p_analytics_ci_cd_pipelines_weekly
 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_7d/20211126090001_p_analytics_ci_cd_pipelines.yml b/config/metrics/counts_7d/20211126090001_p_analytics_ci_cd_pipelines.yml
index ec686425d7c..4afd72d630a 100644
--- a/config/metrics/counts_7d/20211126090001_p_analytics_ci_cd_pipelines.yml
+++ b/config/metrics/counts_7d/20211126090001_p_analytics_ci_cd_pipelines.yml
@@ -4,7 +4,7 @@ key_path: analytics_unique_visits.p_analytics_ci_cd_pipelines
 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_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml b/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
index bee4b88889e..1f7be3ded22 100644
--- a/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
+++ b/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
@@ -4,7 +4,7 @@ key_path: analytics_unique_visits.p_analytics_ci_cd_deployment_frequency
 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_7d/20211126090003_p_analytics_ci_cd_lead_time.yml b/config/metrics/counts_7d/20211126090003_p_analytics_ci_cd_lead_time.yml
index 3c1f6082049..4d74fb08f1b 100644
--- a/config/metrics/counts_7d/20211126090003_p_analytics_ci_cd_lead_time.yml
+++ b/config/metrics/counts_7d/20211126090003_p_analytics_ci_cd_lead_time.yml
@@ -4,7 +4,7 @@ key_path: analytics_unique_visits.p_analytics_ci_cd_lead_time
 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_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml b/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
index d2181a95876..6826e082e79 100644
--- a/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
+++ b/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.analytics.p_analytics_ci_cd_deployment_frequency_we
 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_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml b/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
index 8d11cc16fcc..ba1b01f2e9c 100644
--- a/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
+++ b/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.analytics.p_analytics_ci_cd_lead_time_weekly
 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_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml b/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml
index ae251b65362..6677e5d3b56 100644
--- a/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml
+++ b/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.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_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml b/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml
index 96c2fb4ced9..fc5dceec67d 100644
--- a/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml
+++ b/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.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_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml b/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml
index 831ec2509b1..07375b2d712 100644
--- a/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml
+++ b/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.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_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml b/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml
index cfdbc345ef9..3cc1e18c738 100644
--- a/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml
+++ b/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.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_7d/20220121140634_user_jetbrains_api_request_weekly.yml b/config/metrics/counts_7d/20220121140634_user_jetbrains_api_request_weekly.yml
index 40e7b3ba04f..b98c4aefe7b 100644
--- a/config/metrics/counts_7d/20220121140634_user_jetbrains_api_request_weekly.yml
+++ b/config/metrics/counts_7d/20220121140634_user_jetbrains_api_request_weekly.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_7d/20220131143201_i_quickactions_attention_weekly.yml b/config/metrics/counts_7d/20220131143201_i_quickactions_attention_weekly.yml
index 2bd6c25281d..3e47fca1265 100644
--- a/config/metrics/counts_7d/20220131143201_i_quickactions_attention_weekly.yml
+++ b/config/metrics/counts_7d/20220131143201_i_quickactions_attention_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_attention_weekly
 description: Count of WAU 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_7d/20220131153223_i_quickactions_remove_attention_weekly.yml b/config/metrics/counts_7d/20220131153223_i_quickactions_remove_attention_weekly.yml
index 38f9841f447..315cac183d1 100644
--- a/config/metrics/counts_7d/20220131153223_i_quickactions_remove_attention_weekly.yml
+++ b/config/metrics/counts_7d/20220131153223_i_quickactions_remove_attention_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_remove_attention_weekly
 description: Count of WAU 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_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml b/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml
index ca5f67e0ac5..e3b9e3623a5 100644
--- a/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml
+++ b/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_users.ci_users_executing_deployment_job_weekly
 description: Weekly 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_7d/20220216204730_users_updating_work_item_title_weekly.yml b/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
index 92fb6dbd03d..e533d2a309e 100644
--- a/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
+++ b/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.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_7d/20220221210026_users_creating_work_items_weekly.yml b/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
index 0c7e18ec458..fbc8e23b018 100644
--- a/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
+++ b/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.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_7d/20220222215851_xmau_plan.yml b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
index cc393d6b0a5..170b1c595de 100644
--- a/config/metrics/counts_7d/20220222215851_xmau_plan.yml
+++ b/config/metrics/counts_7d/20220222215851_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_7d/20220222215852_xmau_project_management.yml b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
index 40eaf21889e..061ee13722b 100644
--- a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
+++ b/config/metrics/counts_7d/20220222215852_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_7d/20220222215855_users_work_items.yml b/config/metrics/counts_7d/20220222215855_users_work_items.yml
index fe77e885449..b749a7c9430 100644
--- a/config/metrics/counts_7d/20220222215855_users_work_items.yml
+++ b/config/metrics/counts_7d/20220222215855_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_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml b/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml
index 1b65c7b1c84..da30c60b823 100644
--- a/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_latest_weekly
 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_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml b/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml
index 64760e33d59..f60936e8492 100644
--- a/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.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 (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_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml b/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml
index 13d03d6c833..85e32e385fb 100644
--- a/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.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_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml b/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml
index 74eb8fffa9a..61d3ceff055 100644
--- a/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.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_7d/20220322194922_users_gitlab_cli_api_request_weekly.yml b/config/metrics/counts_7d/20220322194922_users_gitlab_cli_api_request_weekly.yml
index 333e84873b4..272bd61d336 100644
--- a/config/metrics/counts_7d/20220322194922_users_gitlab_cli_api_request_weekly.yml
+++ b/config/metrics/counts_7d/20220322194922_users_gitlab_cli_api_request_weekly.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 week 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_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml b/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml
index 9bba92b5162..55f2b54a373 100644
--- a/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml
+++ b/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_iac_weekly
 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_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml b/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml
index c28dfd94cad..0ce53e6433e 100644
--- a/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml
+++ b/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_security_sast_iac_weekl
 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_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
index 33e5c7f25f9..d67dc70f013 100644
--- a/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
@@ -4,7 +4,7 @@ name: count_unique_users_interacting_with_timeline_events_weekly
 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_7d/20220622084654_p_analytics_ci_cd_time_to_restore_service_weekly.yml b/config/metrics/counts_7d/20220622084654_p_analytics_ci_cd_time_to_restore_service_weekly.yml
new file mode 100644
index 00000000000..681fed23d11
--- /dev/null
+++ b/config/metrics/counts_7d/20220622084654_p_analytics_ci_cd_time_to_restore_service_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.analytics.p_analytics_ci_cd_time_to_restore_service_weekly
+name: p_analytics_ci_cd_time_to_restore_service_weekly
+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: 7d
+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_7d/20220706175117_ci_users_executing_verify_job_weekly.yml b/config/metrics/counts_7d/20220706175117_ci_users_executing_verify_job_weekly.yml
new file mode 100644
index 00000000000..032ecc838b4
--- /dev/null
+++ b/config/metrics/counts_7d/20220706175117_ci_users_executing_verify_job_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_users.ci_users_executing_verify_environment_job_weekly
+description: Weekly 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: 7d
+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_7d/20220707054526_p_analytics_ci_cd_change_failure_rate_weekly.yml b/config/metrics/counts_7d/20220707054526_p_analytics_ci_cd_change_failure_rate_weekly.yml
new file mode 100644
index 00000000000..2a4889cc3ac
--- /dev/null
+++ b/config/metrics/counts_7d/20220707054526_p_analytics_ci_cd_change_failure_rate_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.analytics.p_analytics_ci_cd_change_failure_rate_weekly
+name: p_analytics_ci_cd_change_failure_rate_weekly
+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: 7d
+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
diff --git a/config/metrics/counts_all/20210201124934_deployments.yml b/config/metrics/counts_all/20210201124934_deployments.yml
index edf11470cb3..b779e3f5955 100644
--- a/config/metrics/counts_all/20210201124934_deployments.yml
+++ b/config/metrics/counts_all/20210201124934_deployments.yml
@@ -4,7 +4,7 @@ key_path: counts.deployments
 description: Total deployments count
 product_section: ops
 product_stage: release
-product_group: group::release
+product_group: release
 value_type: number
 status: active
 milestone: "8.12"
diff --git a/config/metrics/counts_all/20210204124930_servers.yml b/config/metrics/counts_all/20210204124930_servers.yml
index 16e7504db9c..bd756b8bcef 100644
--- a/config/metrics/counts_all/20210204124930_servers.yml
+++ b/config/metrics/counts_all/20210204124930_servers.yml
@@ -4,7 +4,7 @@ key_path: gitaly.servers
 description: Total Gitalty Servers
 product_section: dev
 product_stage: create
-product_group: group::gitaly
+product_group: gitaly
 product_category: gitaly
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210204124932_clusters.yml b/config/metrics/counts_all/20210204124932_clusters.yml
index 963726e3a14..6f7524c8765 100644
--- a/config/metrics/counts_all/20210204124932_clusters.yml
+++ b/config/metrics/counts_all/20210204124932_clusters.yml
@@ -4,7 +4,7 @@ key_path: gitaly.clusters
 description: Total GitLab Managed clusters both enabled and disabled
 product_section: dev
 product_stage: create
-product_group: group::gitaly
+product_group: gitaly
 product_category: gitaly
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
index 324ceb8ec84..d7b16d01d8b 100644
--- a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
+++ b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
@@ -4,7 +4,7 @@ key_path: counts.cycle_analytics_views
 description: Total visits to VSA (both group- and project-level) all time
 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_all/20210216175019_projects_with_prometheus_alerts.yml b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
index 4957376bb26..e0f5b6d986d 100644
--- a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_prometheus_alerts
 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_all/20210216175021_pod_logs_usages_total.yml b/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
index e228a852d5d..b824d0a5467 100644
--- a/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
+++ b/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
@@ -4,7 +4,7 @@ key_path: counts.pod_logs_usages_total
 description: Count the total number of log views
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: logging
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
index 6c96cc69601..24d6586559a 100644
--- a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
@@ -4,7 +4,7 @@ key_path: counts.service_desk_enabled_projects
 description: Count of service desk enabled projects
 product_section: dev
 product_stage: plan
-product_group: group::certify
+product_group: certify
 product_category: service_desk
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175026_service_desk_issues.yml b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
index 139f8716978..f0045c46d56 100644
--- a/config/metrics/counts_all/20210216175026_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
@@ -4,7 +4,7 @@ key_path: counts.service_desk_issues
 description: Count of service desk issues
 product_section: dev
 product_stage: plan
-product_group: group::certify
+product_group: certify
 product_category: service_desk
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175037_suggestions.yml b/config/metrics/counts_all/20210216175037_suggestions.yml
index a1ba75cd51a..0cb2d37cbf3 100644
--- a/config/metrics/counts_all/20210216175037_suggestions.yml
+++ b/config/metrics/counts_all/20210216175037_suggestions.yml
@@ -4,7 +4,7 @@ key_path: counts.suggestions
 description: Count of all comments that contain suggested changes
 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_all/20210216175039_merge_requests.yml b/config/metrics/counts_all/20210216175039_merge_requests.yml
index e7d46f138b5..fb465ace311 100644
--- a/config/metrics/counts_all/20210216175039_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175039_merge_requests.yml
@@ -4,7 +4,7 @@ key_path: counts.merge_requests
 description: Count of the number 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: active
diff --git a/config/metrics/counts_all/20210216175041_merge_request_comment.yml b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
index 2e14d7f87ab..2c060e57c49 100644
--- a/config/metrics/counts_all/20210216175041_merge_request_comment.yml
+++ b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
@@ -4,7 +4,7 @@ key_path: counts.merge_request_comment
 description: Count of the number of merge request comments
 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_all/20210216175043_merge_request_create.yml b/config/metrics/counts_all/20210216175043_merge_request_create.yml
index 4986a4f3f6e..3c2eb359f93 100644
--- a/config/metrics/counts_all/20210216175043_merge_request_create.yml
+++ b/config/metrics/counts_all/20210216175043_merge_request_create.yml
@@ -4,7 +4,7 @@ key_path: counts.merge_request_create
 description: Count of the number of merge requests created
 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_all/20210216175045_merge_requests.yml b/config/metrics/counts_all/20210216175045_merge_requests.yml
index 2871c70abaa..5cf80a4b438 100644
--- a/config/metrics/counts_all/20210216175045_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175045_merge_requests.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.create.merge_requests
 description: Count of the number of users creating 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_all/20210216175053_suggestions.yml b/config/metrics/counts_all/20210216175053_suggestions.yml
index 774f355b02c..594832cae4f 100644
--- a/config/metrics/counts_all/20210216175053_suggestions.yml
+++ b/config/metrics/counts_all/20210216175053_suggestions.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.create.suggestions
 description: Count of unique users who create suggestions in merge request 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_all/20210216175229_auto_devops_enabled.yml b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
index 85870f728bb..0ab6b1178da 100644
--- a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
+++ b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
@@ -5,7 +5,7 @@ description: Projects with Auto DevOps template enabled (excluding implicit Auto
   enabled and Auto DevOps template includes)
 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_all/20210216175231_auto_devops_disabled.yml b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
index 19089c21eb4..b4f194b147d 100644
--- a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
+++ b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
@@ -4,7 +4,7 @@ key_path: counts.auto_devops_disabled
 description: Projects with Auto DevOps template disabled
 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_all/20210216175232_clusters.yml b/config/metrics/counts_all/20210216175232_clusters.yml
index e642c22a735..81714863df8 100644
--- a/config/metrics/counts_all/20210216175232_clusters.yml
+++ b/config/metrics/counts_all/20210216175232_clusters.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters
 description: Total GitLab Managed clusters both enabled and disabled
 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_all/20210216175234_clusters_enabled.yml b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
index cc230c6a201..35f4706cfa5 100644
--- a/config/metrics/counts_all/20210216175234_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_enabled
 description: Number of Kubernetes clusters attached to GitLab 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_all/20210216175236_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
index f12ec1f7301..c7b45d0cdb6 100644
--- a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: counts.project_clusters_enabled
 description: Total GitLab Managed 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_all/20210216175238_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
index 2fa75d87214..1e660cc2623 100644
--- a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: counts.group_clusters_enabled
 description: Total GitLab Managed 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_all/20210216175240_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
index 201d1f72b8d..fb335e9811c 100644
--- a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: counts.instance_clusters_enabled
 description: Total GitLab Managed 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_all/20210216175242_clusters_disabled.yml b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
index 00fdee27e2c..67e21b57030 100644
--- a/config/metrics/counts_all/20210216175242_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_disabled
 description: Number of Kubernetes clusters attached to GitLab currently disabled
 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_all/20210216175244_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
index 21d704b5090..fc22e4deb5d 100644
--- a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: counts.project_clusters_disabled
 description: Total GitLab Managed disabled clusters previously 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_all/20210216175246_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
index b31c129496c..154926ce1cb 100644
--- a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: counts.group_clusters_disabled
 description: Total GitLab Managed disabled clusters previously 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_all/20210216175248_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
index e60c7a13fcf..bd91e116f6b 100644
--- a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: counts.instance_clusters_disabled
 description: Total GitLab Managed disabled clusters previously 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_all/20210216175250_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
index 343275db3f7..f3ba6bb42dc 100644
--- a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_platforms_eks
 description: Total 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_all/20210216175251_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
index 4f7c85953ed..7c0df4a79fb 100644
--- a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_platforms_gke
 description: Total 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_all/20210216175253_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
index c0cce763b21..b56a1e17984 100644
--- a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_platforms_user
 description: Total 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_all/20210216175255_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
index e772f669513..4d727e9c7d7 100644
--- a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_helm
 description: Total GitLab Managed clusters with GitLab Managed App: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_all/20210216175257_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
index 1e31c28f543..e59c89952aa 100644
--- a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_ingress
 description: Total GitLab Managed clusters with GitLab Managed App:Ingress installed
 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_all/20210216175259_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
index bc16040f143..b42537dab1c 100644
--- a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_cert_managers
 description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager installed
 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_all/20210216175301_clusters_applications_crossplane.yml b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
index 2856a0e25ac..2ffd21a39a4 100644
--- a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
+++ b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_crossplane
 description: Total GitLab Managed clusters with GitLab Managed App:Crossplane installed
 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_all/20210216175303_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
index 961c9adfdb7..0735993d627 100644
--- a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_prometheus
 description: Total GitLab Managed clusters with GitLab Managed App:Prometheus installed
 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_all/20210216175305_clusters_applications_runner.yml b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
index 33f8d045d2b..c3a30bf8452 100644
--- a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_runner
 description: Total GitLab Managed clusters with GitLab Managed App:Runner installed
 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_all/20210216175307_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
index e5a80ca6385..08f543609b5 100644
--- a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_knative
 description: Total GitLab Managed clusters with GitLab Managed App:Knative installed
 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_all/20210216175309_clusters_applications_elastic_stack.yml b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
index 4d5dbcd198f..7a303ed2f1e 100644
--- a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
+++ b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_elastic_stack
 description: Total GitLab Managed clusters with GitLab Managed App:Elastic Stack installed
 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_all/20210216175310_clusters_applications_jupyter.yml b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
index 85d62985fa8..d4870126fb0 100644
--- a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
+++ b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_jupyter
 description: Total GitLab Managed clusters with GitLab Managed App:Jupyter installed
 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_all/20210216175312_clusters_applications_cilium.yml b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
index 33a8a53a8ab..415c9fc7811 100644
--- a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
+++ b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_cilium
 description: Total GitLab Managed clusters with GitLab Managed App:Cilium installed
 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_all/20210216175314_clusters_management_project.yml b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
index fb8421d4bf2..b0fa6e65e07 100644
--- a/config/metrics/counts_all/20210216175314_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_management_project
 description: Total GitLab Managed clusters with defined cluster management project
 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_all/20210216175316_kubernetes_agents.yml b/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
index f126415a78f..7c97d38a300 100644
--- a/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
+++ b/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
@@ -4,7 +4,7 @@ key_path: counts.kubernetes_agents
 description: Count of Kubernetes registered agents
 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_all/20210216175318_kubernetes_agents_with_token.yml b/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
index 6cbdb1679a5..c96ab785fbb 100644
--- a/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
+++ b/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
@@ -4,7 +4,7 @@ key_path: counts.kubernetes_agents_with_token
 description: Count of Kubernetes agents with at least one token
 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_all/20210216175320_projects_with_terraform_reports.yml b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
index 1008e17211d..490d267a856 100644
--- a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_terraform_reports
 description: Count of projects with Terraform MR reports
 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_all/20210216175322_projects_with_terraform_states.yml b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
index 14621390630..27c1087a3a7 100644
--- a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_terraform_states
 description: Count of projects with GitLab Managed Terraform State
 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_all/20210216175324_terraform_reports.yml b/config/metrics/counts_all/20210216175324_terraform_reports.yml
index 69e21a7d63e..eed669c8583 100644
--- a/config/metrics/counts_all/20210216175324_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175324_terraform_reports.yml
@@ -4,7 +4,7 @@ key_path: counts.terraform_reports
 description: Count of Terraform MR reports generated
 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_all/20210216175326_terraform_states.yml b/config/metrics/counts_all/20210216175326_terraform_states.yml
index 06b6e6d7928..3540b0bf02a 100644
--- a/config/metrics/counts_all/20210216175326_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175326_terraform_states.yml
@@ -4,7 +4,7 @@ key_path: counts.terraform_states
 description: Count 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_all/20210216175329_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
index f97816e18c1..43731d35061 100644
--- a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_applications_cert_managers
 description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager installed
 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_all/20210216175331_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
index 28c58e11854..d044a7bfbe2 100644
--- a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_applications_helm
 description: Total GitLab Managed clusters with GitLab Managed App: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_all/20210216175333_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
index b93198b92a4..dd80a467825 100644
--- a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_applications_ingress
 description: Total GitLab Managed clusters with GitLab Managed App:Ingress installed
 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_all/20210216175335_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
index 735f3ea8e04..d0bd9329b6f 100644
--- a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_applications_knative
 description: Total GitLab Managed clusters with GitLab Managed App:Knative installed
 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_all/20210216175337_clusters_management_project.yml b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
index 8ed91a5e0f0..958760f57e6 100644
--- a/config/metrics/counts_all/20210216175337_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_management_project
 description: Total GitLab Managed clusters with defined cluster management project
 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_all/20210216175339_clusters_disabled.yml b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
index 5490df2a311..63fd19ddff2 100644
--- a/config/metrics/counts_all/20210216175339_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_disabled
 description: Total 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_all/20210216175341_clusters_enabled.yml b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
index a5b64e3490b..6e8761ae414 100644
--- a/config/metrics/counts_all/20210216175341_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_enabled
 description: Total 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_all/20210216175343_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
index 3be2ae9259b..02730ce5bc2 100644
--- a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_platforms_gke
 description: Total 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_all/20210216175345_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
index 898db74ceed..ad7c5dd99c9 100644
--- a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_platforms_eks
 description: Total 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_all/20210216175346_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
index d6fe1d162c4..fc7710bc490 100644
--- a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_platforms_user
 description: Total 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_all/20210216175348_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
index 4c8c3ccac9d..6a621914e27 100644
--- a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.instance_clusters_disabled
 description: Total 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_all/20210216175350_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
index 4f065bb0506..5f81b41a670 100644
--- a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.instance_clusters_enabled
 description: Total 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_all/20210216175352_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
index 902fd31a5f3..a16a70d822e 100644
--- a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.group_clusters_disabled
 description: Total 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_all/20210216175354_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
index 197f0a7ea1b..c036e3ea7b0 100644
--- a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.group_clusters_enabled
 description: Total 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_all/20210216175356_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
index cd406c21eed..a36f8deebfc 100644
--- a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.project_clusters_disabled
 description: Total 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_all/20210216175358_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
index e106a31c4b6..1a189b8d0da 100644
--- a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.project_clusters_enabled
 description: Total 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_all/20210216175403_projects_with_prometheus_alerts.yml b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
index 71a38117826..b443721868c 100644
--- a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.projects_with_prometheus_alerts
 description: Projects with Prometheus alerting 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_all/20210216175442_ingress_modsecurity_packets_processed.yml b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
index ef8bb634b85..fb8c3b61355 100644
--- a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
+++ b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
@@ -5,7 +5,7 @@ description: Cumulative count of packets processed by ModSecurity since Usage Pi
   was last reported
 product_section: sec
 product_stage: protect
-product_group: group::container security
+product_group: container_security
 product_category: web_firewall
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
index 067ac95782f..ba3575f8b0b 100644
--- a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
+++ b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
@@ -5,7 +5,7 @@ description: Cumulative count of packets identified as anomalous by ModSecurity
   Usage Ping was last reported
 product_section: sec
 product_stage: protect
-product_group: group::container security
+product_group: container_security
 product_category: web_firewall
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
index 64d7a9434be..92774a9aa54 100644
--- a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
+++ b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
@@ -5,7 +5,7 @@ description: Cumulative count of packets forwarded by Cilium (Container Network
   since Usage Ping was last reported
 product_section: sec
 product_stage: protect
-product_group: group::container security
+product_group: container_security
 product_category: container_network_security
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175448_network_policy_drops.yml b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
index d3a874253f9..10b6a79205b 100644
--- a/config/metrics/counts_all/20210216175448_network_policy_drops.yml
+++ b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
@@ -5,7 +5,7 @@ description: Cumulative count of packets dropped by Cilium (Container Network Se
   since Usage Ping was last reported
 product_section: sec
 product_stage: protect
-product_group: group::container security
+product_group: container_security
 product_category: container_network_security
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
index 55dc3b6ca3b..3255aa90e63 100644
--- a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
+++ b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
@@ -4,7 +4,7 @@ key_path: counts.ingress_modsecurity_logging
 description: Whether or not ModSecurity is set to logging mode
 product_section: sec
 product_stage: protect
-product_group: group::container security
+product_group: container_security
 product_category: web_firewall
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
index c21b1d24885..4589c483ae2 100644
--- a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
+++ b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
@@ -4,7 +4,7 @@ key_path: counts.ingress_modsecurity_blocking
 description: Whether or not ModSecurity is set to blocking mode
 product_section: sec
 product_stage: protect
-product_group: group::container security
+product_group: container_security
 product_category: web_firewall
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
index a4f4910cf76..9213bbcefb7 100644
--- a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
+++ b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
@@ -4,7 +4,7 @@ key_path: counts.ingress_modsecurity_disabled
 description: Whether or not ModSecurity is disabled within Ingress
 product_section: sec
 product_stage: protect
-product_group: group::container security
+product_group: container_security
 product_category: web_firewall
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
index 4a3717786be..659a3b66a8b 100644
--- a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
+++ b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
@@ -4,7 +4,7 @@ key_path: counts.ingress_modsecurity_not_installed
 description: Whether or not ModSecurity has not been installed into the cluster
 product_section: sec
 product_stage: protect
-product_group: group::container security
+product_group: container_security
 product_category: web_firewall
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175510_ci_builds.yml b/config/metrics/counts_all/20210216175510_ci_builds.yml
index d4d566eef00..ee7f91cd1e8 100644
--- a/config/metrics/counts_all/20210216175510_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175510_ci_builds.yml
@@ -4,7 +4,7 @@ key_path: counts.ci_builds
 description: Unique 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_all/20210216175512_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
index fbe697fc77b..44a384a8ff5 100644
--- a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
@@ -4,7 +4,7 @@ key_path: counts.ci_internal_pipelines
 description: Total pipelines in GitLab repositories
 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_all/20210216175514_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
index b27115aa904..03958d43d99 100644
--- a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
@@ -4,7 +4,7 @@ key_path: counts.ci_external_pipelines
 description: Total pipelines in external repositories
 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_all/20210216175516_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
index 7dc2a7a756b..1b4c8cfc73b 100644
--- a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
@@ -4,7 +4,7 @@ key_path: counts.ci_pipeline_config_auto_devops
 description: Total pipelines from an Auto DevOps template
 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_all/20210216175518_ci_pipeline_config_repository.yml b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
index 2d904295d18..12ec851fef7 100644
--- a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
@@ -4,7 +4,7 @@ key_path: counts.ci_pipeline_config_repository
 description: Total Pipelines from CI files in 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_all/20210216175520_ci_runners.yml b/config/metrics/counts_all/20210216175520_ci_runners.yml
index b3fa3f2678b..f3f13553663 100644
--- a/config/metrics/counts_all/20210216175520_ci_runners.yml
+++ b/config/metrics/counts_all/20210216175520_ci_runners.yml
@@ -4,7 +4,7 @@ key_path: counts.ci_runners
 description: Total configured Runners of all types
 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_all/20210216175521_ci_triggers.yml b/config/metrics/counts_all/20210216175521_ci_triggers.yml
index 7b8f54f0e25..14a305c5c4d 100644
--- a/config/metrics/counts_all/20210216175521_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175521_ci_triggers.yml
@@ -4,7 +4,7 @@ key_path: counts.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_all/20210216175523_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
index 7917c26b8f9..a498f4d0e6f 100644
--- a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
@@ -4,7 +4,7 @@ key_path: counts.ci_pipeline_schedules
 description: 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_all/20210216175525_ci_builds.yml b/config/metrics/counts_all/20210216175525_ci_builds.yml
index cfa86761e7e..37ffe117ede 100644
--- a/config/metrics/counts_all/20210216175525_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175525_ci_builds.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.verify.ci_builds
 description: Unique count of 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_all/20210216175527_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
index 531f402ce0a..d393fd3e924 100644
--- a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.verify.ci_external_pipelines
 description: Total pipelines in external repositories
 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_all/20210216175529_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
index b58e49b2603..0114bf5a9f2 100644
--- a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.verify.ci_internal_pipelines
 description: Total pipelines in GitLab repositories
 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_all/20210216175531_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
index 982fe4799e8..abdb32a404f 100644
--- a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.verify.ci_pipeline_config_auto_devops
 description: Total pipelines from an Auto DevOps template
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: auto_devops
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
index c28daf950dd..e43db505fb3 100644
--- a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.verify.ci_pipeline_config_repository
 description: Total 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_all/20210216175535_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
index 82084178273..99e59274094 100644
--- a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.verify.ci_pipeline_schedules
 description: 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_all/20210216175537_ci_pipelines.yml b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
index 70b1c4138be..bfd90a78524 100644
--- a/config/metrics/counts_all/20210216175537_ci_pipelines.yml
+++ b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.verify.ci_pipelines
 description: Distinct Users triggering Total pipelines
 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_all/20210216175539_ci_triggers.yml b/config/metrics/counts_all/20210216175539_ci_triggers.yml
index 76824228a41..e28a8487c04 100644
--- a/config/metrics/counts_all/20210216175539_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175539_ci_triggers.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.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_all/20210216175621_web_hooks.yml b/config/metrics/counts_all/20210216175621_web_hooks.yml
index 326c1f08539..8614e7d4be6 100644
--- a/config/metrics/counts_all/20210216175621_web_hooks.yml
+++ b/config/metrics/counts_all/20210216175621_web_hooks.yml
@@ -4,7 +4,7 @@ key_path: counts.web_hooks
 description: Count of web hooks
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175623_projects_asana_active.yml b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
index ca0ff0cdaf7..5b6e4ece343 100644
--- a/config/metrics/counts_all/20210216175623_projects_asana_active.yml
+++ b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_asana_active
 description: Count of projects with active integrations for Asana
 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_all/20210216175625_groups_asana_active.yml b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
index 3c1cd0378d0..87269b04570 100644
--- a/config/metrics/counts_all/20210216175625_groups_asana_active.yml
+++ b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_asana_active
 description: Count of groups with active integrations for Asana
 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_all/20210216175627_templates_asana_active.yml b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
index 3575f359f99..121409c5b7f 100644
--- a/config/metrics/counts_all/20210216175627_templates_asana_active.yml
+++ b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_asana_active
 description: Count of active service templates for Asana
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175628_instances_asana_active.yml b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
index ab2a7ab1fd8..0a5c5fa1242 100644
--- a/config/metrics/counts_all/20210216175628_instances_asana_active.yml
+++ b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_asana_active
 description: Count of active instance-level integrations for Asana
 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_all/20210216175630_projects_inheriting_asana_active.yml b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
index fd79b15fd68..be27b267acd 100644
--- a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_asana_active
 description: Count of active projects inheriting integrations for Asana
 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_all/20210216175632_groups_inheriting_asana_active.yml b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
index 5f8203fda4b..06bb348d677 100644
--- a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_asana_active
 description: Count of active groups inheriting integrations for Asana
 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_all/20210216175634_projects_assembla_active.yml b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
index 6d98db7ab3c..ad6ae1afc72 100644
--- a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_assembla_active
 description: Count of projects with active integrations for Assembla
 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_all/20210216175636_groups_assembla_active.yml b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
index e04faffc57f..a9a1ba26633 100644
--- a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_assembla_active
 description: Count of groups with active integrations for Assembla
 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_all/20210216175638_templates_assembla_active.yml b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
index d0f203e12c5..88d0c631218 100644
--- a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_assembla_active
 description: Count of active service templates for Assembla
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
index ee2ff3254cc..c76d508d58c 100644
--- a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_assembla_active
 description: Count of active instance-level integrations for Assembla
 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_all/20210216175642_projects_inheriting_assembla_active.yml b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
index c67864be199..72143e165cc 100644
--- a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_assembla_active
 description: Count of active projects inheriting integrations for Assembla
 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_all/20210216175644_groups_inheriting_assembla_active.yml b/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
index 4d220c45a70..d22ac41c550 100644
--- a/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_assembla_active
 description: Count of active groups inheriting integrations for Assembla
 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_all/20210216175645_projects_bamboo_active.yml b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
index 2f5fa08d325..3ad3dfb25a9 100644
--- a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_bamboo_active
 description: Count of projects with active integrations for Bamboo CI
 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_all/20210216175647_groups_bamboo_active.yml b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
index c136a7b1c41..e5543ca5766 100644
--- a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_bamboo_active
 description: Count of groups with active integrations for Bamboo CI
 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_all/20210216175649_templates_bamboo_active.yml b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
index 2e97c4bf1be..96947738ac7 100644
--- a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_bamboo_active
 description: Count of active service templates for Bamboo CI
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
index d7a266eceb8..db0824288cd 100644
--- a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_bamboo_active
 description: Count of active instance-level integrations for Bamboo CI
 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_all/20210216175653_projects_inheriting_bamboo_active.yml b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
index 69f8205923c..429540bdbd4 100644
--- a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_bamboo_active
 description: Count of active projects inheriting integrations for Bamboo CI
 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_all/20210216175655_groups_inheriting_bamboo_active.yml b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
index 6c71d922567..19bc979b41e 100644
--- a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_bamboo_active
 description: Count of active groups inheriting integrations for Bamboo CI
 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_all/20210216175657_projects_bugzilla_active.yml b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
index e4869d575a1..39caf54919d 100644
--- a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_bugzilla_active
 description: Count of projects with active integrations for Bugzilla
 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_all/20210216175659_groups_bugzilla_active.yml b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
index 433eb3f248c..2e3c1b5527f 100644
--- a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_bugzilla_active
 description: Count of groups with active integrations for Bugzilla
 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_all/20210216175701_templates_bugzilla_active.yml b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
index 6d26fbfb8dd..12866071b53 100644
--- a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_bugzilla_active
 description: Count of active service templates for Bugzilla
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
index 89aac1d7bb8..55f5f38555a 100644
--- a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_bugzilla_active
 description: Count of active instance-level integrations for Bugzilla
 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_all/20210216175704_projects_inheriting_bugzilla_active.yml b/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
index c85fdde5970..be9231fcece 100644
--- a/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_bugzilla_active
 description: Count of active projects inheriting integrations for Bugzilla
 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_all/20210216175706_groups_inheriting_bugzilla_active.yml b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
index 9b9e49052c0..699b9019dfc 100644
--- a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_bugzilla_active
 description: Count of active groups inheriting integrations for Bugzilla
 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_all/20210216175708_projects_buildkite_active.yml b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
index cd99e26434e..741b7220458 100644
--- a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_buildkite_active
 description: Count of projects with active integrations for Buildkite
 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_all/20210216175710_groups_buildkite_active.yml b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
index fde47913509..1b334022e44 100644
--- a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_buildkite_active
 description: Count of groups with active integrations for Buildkite
 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_all/20210216175712_templates_buildkite_active.yml b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
index 8218ae10cae..d5a46ed861c 100644
--- a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_buildkite_active
 description: Count of active service templates for Buildkite
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
index ee905ce7668..8d99d2c1f05 100644
--- a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_buildkite_active
 description: Count of active instance-level integrations for Buildkite
 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_all/20210216175716_projects_inheriting_buildkite_active.yml b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
index f91773fe320..fd54ff78891 100644
--- a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_buildkite_active
 description: Count of active projects inheriting integrations for Buildkite
 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_all/20210216175717_groups_inheriting_buildkite_active.yml b/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
index fee0f23de9e..350f74c97b7 100644
--- a/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_buildkite_active
 description: Count of active groups inheriting integrations for Buildkite
 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_all/20210216175719_projects_campfire_active.yml b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
index b61c070c844..73d8a063f0b 100644
--- a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_campfire_active
 description: Count of projects with active integrations for Campfire
 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_all/20210216175721_groups_campfire_active.yml b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
index 0bb65e4336a..c4879e4fd91 100644
--- a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_campfire_active
 description: Count of groups with active integrations for Campfire
 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_all/20210216175723_templates_campfire_active.yml b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
index 2e8b09e4997..b5b8b9905ca 100644
--- a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_campfire_active
 description: Count of active service templates for Campfire
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
index f5082d71885..88a013fff2f 100644
--- a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_campfire_active
 description: Count of active instance-level integrations for Campfire
 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_all/20210216175727_projects_inheriting_campfire_active.yml b/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
index 11f7ba2bcc9..51150db3bdd 100644
--- a/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_campfire_active
 description: Count of active projects inheriting integrations for Campfire
 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_all/20210216175729_groups_inheriting_campfire_active.yml b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
index 8a4585d6d6e..f081a57eff4 100644
--- a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_campfire_active
 description: Count of active groups inheriting integrations for Campfire
 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_all/20210216175731_projects_confluence_active.yml b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
index edab23f9eb5..c361af80c75 100644
--- a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_confluence_active
 description: Count of projects with active integrations for Confluence
 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_all/20210216175733_groups_confluence_active.yml b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
index 818be9e61bc..8a9d3e4aa2b 100644
--- a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_confluence_active
 description: Count of groups with active integrations for Confluence
 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_all/20210216175734_templates_confluence_active.yml b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
index 2287415e83c..5b09f81d9f7 100644
--- a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_confluence_active
 description: Count of active service templates for Confluence
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
index 83da2211379..f8df0b86ffd 100644
--- a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_confluence_active
 description: Count of active instance-level integrations for Confluence
 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_all/20210216175738_projects_inheriting_confluence_active.yml b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
index 104ee9b8afa..c59ba1dd8f8 100644
--- a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_confluence_active
 description: Count of active projects inheriting integrations for Confluence
 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_all/20210216175740_groups_inheriting_confluence_active.yml b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
index 855f298d716..2242a04f332 100644
--- a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_confluence_active
 description: Count of active groups inheriting integrations for Confluence
 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_all/20210216175742_projects_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
index f6125e01db2..a727e6fedb6 100644
--- a/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_custom_issue_tracker_active
 description: Count of projects with active integrations for a Custom Issue Tracker
 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_all/20210216175744_groups_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
index 78078808ced..4c63579d92e 100644
--- a/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_custom_issue_tracker_active
 description: Count of groups with active integrations for a Custom Issue Tracker
 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_all/20210216175745_templates_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
index 343c4c887aa..b1f0c7955ff 100644
--- a/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_custom_issue_tracker_active
 description: Count of active service templates for a Custom Issue Tracker
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
index c63b95a30fa..a87c20b1e8b 100644
--- a/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_custom_issue_tracker_active
 description: Count of active instance-level integrations for a Custom Issue Tracker
 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_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
index b25687486b8..1ef220f5e4f 100644
--- a/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_custom_issue_tracker_active
 description: Count of active projects inheriting integrations for a Custom Issue Tracker
 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_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
index 5ec00059577..0ff7a037288 100644
--- a/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_custom_issue_tracker_active
 description: Count of active groups inheriting integrations for a Custom Issue Tracker
 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_all/20210216175753_projects_discord_active.yml b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
index 7337be70d10..9b4eecbd372 100644
--- a/config/metrics/counts_all/20210216175753_projects_discord_active.yml
+++ b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_discord_active
 description: Count of projects with active integrations for Discord
 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_all/20210216175755_groups_discord_active.yml b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
index f9b38fee8fa..7ac463d87e3 100644
--- a/config/metrics/counts_all/20210216175755_groups_discord_active.yml
+++ b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_discord_active
 description: Count of groups with active integrations for Discord
 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_all/20210216175756_templates_discord_active.yml b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
index 9f057665e3a..4b913f35acd 100644
--- a/config/metrics/counts_all/20210216175756_templates_discord_active.yml
+++ b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_discord_active
 description: Count of active service templates for Discord
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175758_instances_discord_active.yml b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
index 9eaaa0763cd..5d790f5d6df 100644
--- a/config/metrics/counts_all/20210216175758_instances_discord_active.yml
+++ b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_discord_active
 description: Count of active instance-level integrations for Discord
 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_all/20210216175800_projects_inheriting_discord_active.yml b/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
index bfc703c42a9..85634cb58b2 100644
--- a/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_discord_active
 description: Count of active projects inheriting integrations for Discord
 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_all/20210216175802_groups_inheriting_discord_active.yml b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
index fe0e87708e6..74f1c4a32f5 100644
--- a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_discord_active
 description: Count of active groups inheriting integrations for Discord
 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_all/20210216175804_projects_drone_ci_active.yml b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
index 2315bf3d9e4..005d9f65a33 100644
--- a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_drone_ci_active
 description: Count of projects with active integrations for Drone CI
 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_all/20210216175806_groups_drone_ci_active.yml b/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
index acb551bab24..23b4fab18b3 100644
--- a/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_drone_ci_active
 description: Count of groups with active integrations for Drone CI
 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_all/20210216175807_templates_drone_ci_active.yml b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
index edec715a037..e3422fb6193 100644
--- a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_drone_ci_active
 description: Count of active service templates for Drone CI
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml b/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
index d20dd22b65f..a47163d7540 100644
--- a/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_drone_ci_active
 description: Count of active instance-level integrations for Drone CI
 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_all/20210216175811_projects_inheriting_drone_ci_active.yml b/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
index 2e5f7446e19..ee862f15d30 100644
--- a/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_drone_ci_active
 description: Count of active projects inheriting integrations for Drone CI
 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_all/20210216175813_groups_inheriting_drone_ci_active.yml b/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
index 0ff92225b8c..aafc802b87c 100644
--- a/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_drone_ci_active
 description: Count of active groups inheriting integrations for Drone CI
 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_all/20210216175815_projects_emails_on_push_active.yml b/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
index 4b81186a6f2..1ba9979c98a 100644
--- a/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_emails_on_push_active
 description: Count of projects with active integrations for Emails on Push
 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_all/20210216175817_groups_emails_on_push_active.yml b/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
index dc298ba5974..6049a9126a7 100644
--- a/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_emails_on_push_active
 description: Count of groups with active integrations for Emails on Push
 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_all/20210216175818_templates_emails_on_push_active.yml b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
index 057e3b3056b..33e588ce60e 100644
--- a/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_emails_on_push_active
 description: Count of active service templates for Emails on Push
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml b/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
index d37c992ebf4..40ab3459baf 100644
--- a/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_emails_on_push_active
 description: Count of active instance-level integrations for Emails on Push
 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_all/20210216175822_projects_inheriting_emails_on_push_active.yml b/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
index b86e285c986..5df16d4bcaf 100644
--- a/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_emails_on_push_active
 description: Count of active projects inheriting integrations for Emails on Push
 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_all/20210216175824_groups_inheriting_emails_on_push_active.yml b/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
index 0d15b246455..c478fc02745 100644
--- a/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_emails_on_push_active
 description: Count of active groups inheriting integrations for Emails on Push
 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_all/20210216175826_projects_external_wiki_active.yml b/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
index 3754c837376..fc99b7a20cc 100644
--- a/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_external_wiki_active
 description: Count of projects with active integrations for External Wiki
 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_all/20210216175828_groups_external_wiki_active.yml b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
index 011a185439a..d154a4ec723 100644
--- a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_external_wiki_active
 description: Count of groups with active integrations for External Wiki
 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_all/20210216175829_templates_external_wiki_active.yml b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
index 31a270395fb..522315e40f6 100644
--- a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_external_wiki_active
 description: Count of active service templates for External Wiki
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml b/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
index f587b145229..9d5e41f4302 100644
--- a/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_external_wiki_active
 description: Count of active instance-level integrations for External Wiki
 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_all/20210216175833_projects_inheriting_external_wiki_active.yml b/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
index 2662f6299da..166d7f1734b 100644
--- a/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_external_wiki_active
 description: Count of active projects inheriting integrations for External Wiki
 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_all/20210216175835_groups_inheriting_external_wiki_active.yml b/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
index f0bb398258f..c233df8e8ff 100644
--- a/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_external_wiki_active
 description: Count of active groups inheriting integrations for External Wiki
 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_all/20210216175837_projects_flowdock_active.yml b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
index 24f36849e59..0ca23369618 100644
--- a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_flowdock_active
 description: Count of projects with active integrations for Flowdock
 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_all/20210216175839_groups_flowdock_active.yml b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
index 91c41908e5e..878a6b1615a 100644
--- a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_flowdock_active
 description: Count of groups with active integrations for Flowdock
 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_all/20210216175840_templates_flowdock_active.yml b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
index 74d085a4447..19bd891b300 100644
--- a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_flowdock_active
 description: Count of active service templates for Flowdock
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
index 0da1700a699..2b58b35d466 100644
--- a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_flowdock_active
 description: Count of active instance-level integrations for Flowdock
 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_all/20210216175844_projects_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
index e930d8642fb..88425a3aaff 100644
--- a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_flowdock_active
 description: Count of active projects inheriting integrations for Flowdock
 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_all/20210216175846_groups_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
index 1d6d4eac8b0..8c8150ec316 100644
--- a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_flowdock_active
 description: Count of active groups inheriting integrations for Flowdock
 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_all/20210216175859_projects_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
index e5ae5159d47..bdb36ce40a4 100644
--- a/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_hangouts_chat_active
 description: Count of projects with active integrations for Hangouts Chat
 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_all/20210216175901_groups_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
index a16d9ceed31..ce776453c04 100644
--- a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_hangouts_chat_active
 description: Count of groups with active integrations for Hangouts Chat
 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_all/20210216175902_templates_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
index fb007335b2d..c41f72918d9 100644
--- a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_hangouts_chat_active
 description: Count of active service templates for Hangouts Chat
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
index 6f04eb7456c..023893954f3 100644
--- a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_hangouts_chat_active
 description: Count of active instance-level integrations for Hangouts Chat
 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_all/20210216175906_projects_inheriting_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
index 85e735be109..2a706665d8f 100644
--- a/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_hangouts_chat_active
 description: Count of active projects inheriting integrations for Hangouts Chat
 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_all/20210216175908_groups_inheriting_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
index 04fb8b998ce..8586fb00ab4 100644
--- a/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_hangouts_chat_active
 description: Count of active groups inheriting integrations for Hangouts Chat
 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_all/20210216175910_projects_hipchat_active.yml b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
index b1e5dfecea4..779f0579f49 100644
--- a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_hipchat_active
 description: Count of projects with active integrations for HipChat
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
index 444bbafc516..16419a7005b 100644
--- a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_hipchat_active
 description: Count of groups with active integrations for HipChat
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
index 40db443b150..65516f0a17b 100644
--- a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_hipchat_active
 description: Count of active service templates for HipChat
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
index ef754887184..0c7c6c5ee99 100644
--- a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_hipchat_active
 description: Count of active instance-level integrations for HipChat
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
index d93814d3b71..febbbf234aa 100644
--- a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_hipchat_active
 description: Count of active projects inheriting integrations for HipChat
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
index 75fbbb12034..df5bc192dfd 100644
--- a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_hipchat_active
 description: Count of active groups inheriting integrations for HipChat
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175921_projects_irker_active.yml b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
index 95eb098645c..c23511b99b0 100644
--- a/config/metrics/counts_all/20210216175921_projects_irker_active.yml
+++ b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_irker_active
 description: Count of projects with active integrations for Irker
 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_all/20210216175923_groups_irker_active.yml b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
index f8321d3a18e..efb8317fd4a 100644
--- a/config/metrics/counts_all/20210216175923_groups_irker_active.yml
+++ b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_irker_active
 description: Count of groups with active integrations for Irker
 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_all/20210216175924_templates_irker_active.yml b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
index c3491169a7e..6075daa321b 100644
--- a/config/metrics/counts_all/20210216175924_templates_irker_active.yml
+++ b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_irker_active
 description: Count of active service templates for Irker
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175926_instances_irker_active.yml b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
index ac306aaeb5f..e2821326503 100644
--- a/config/metrics/counts_all/20210216175926_instances_irker_active.yml
+++ b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_irker_active
 description: Count of active instance-level integrations for Irker
 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_all/20210216175928_projects_inheriting_irker_active.yml b/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
index 5e2e0b9fd65..bce07c5c584 100644
--- a/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_irker_active
 description: Count of active projects inheriting integrations for Irker
 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_all/20210216175930_groups_inheriting_irker_active.yml b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
index eff596e72fb..c99e8ed3d01 100644
--- a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_irker_active
 description: Count of active groups inheriting integrations for Irker
 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_all/20210216175932_projects_jenkins_active.yml b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
index 3fd0e56a4e9..7e71a319c67 100644
--- a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_jenkins_active
 description: Count of projects with active integrations for Jenkins
 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_all/20210216175934_groups_jenkins_active.yml b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
index ffc47a98ea0..5db9b4b46a9 100644
--- a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_jenkins_active
 description: Count of groups with active integrations for Jenkins
 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_all/20210216175935_templates_jenkins_active.yml b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
index 96938d84aee..0205e0497bf 100644
--- a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_jenkins_active
 description: Count of active service templates for Jenkins
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
index 39eabd6c502..4135f36bd0a 100644
--- a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_jenkins_active
 description: Count of active instance-level integrations for Jenkins
 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_all/20210216175939_projects_inheriting_jenkins_active.yml b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
index 98115a001a6..82f93fa3bcd 100644
--- a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_jenkins_active
 description: Count of active projects inheriting integrations for Jenkins
 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_all/20210216175941_groups_inheriting_jenkins_active.yml b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
index ad5dd2a38d3..7b01ab9e25a 100644
--- a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_jenkins_active
 description: Count of active groups inheriting integrations for Jenkins
 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_all/20210216175943_projects_jira_active.yml b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
index cc1cd2b73dd..ac627472066 100644
--- a/config/metrics/counts_all/20210216175943_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_jira_active
 description: Count of projects with active integrations for Jira
 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_all/20210216175945_groups_jira_active.yml b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
index c1632e6006a..d99920be62a 100644
--- a/config/metrics/counts_all/20210216175945_groups_jira_active.yml
+++ b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_jira_active
 description: Count of groups with active integrations for Jira
 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_all/20210216175946_templates_jira_active.yml b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
index 964aef061d2..63c1929b00e 100644
--- a/config/metrics/counts_all/20210216175946_templates_jira_active.yml
+++ b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_jira_active
 description: Count of active service templates for Jira
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175948_instances_jira_active.yml b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
index 6d7cdae01d1..98d1d27bed7 100644
--- a/config/metrics/counts_all/20210216175948_instances_jira_active.yml
+++ b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_jira_active
 description: Count of active instance-level integrations for Jira
 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_all/20210216175950_projects_inheriting_jira_active.yml b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
index df0874cff7b..af8e8414beb 100644
--- a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_jira_active
 description: Count of active projects inheriting integrations for Jira
 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_all/20210216175952_groups_inheriting_jira_active.yml b/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
index c4ec2c12954..3e9531cba26 100644
--- a/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_jira_active
 description: Count of active groups inheriting integrations for Jira
 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_all/20210216175954_projects_mattermost_active.yml b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
index bf021f1b175..b02c9e4919f 100644
--- a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_mattermost_active
 description: Count of projects with active integrations for Mattermost
 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_all/20210216175956_groups_mattermost_active.yml b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
index 70756d6ae02..cdf2962548c 100644
--- a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_mattermost_active
 description: Count of groups with active integrations for Mattermost
 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_all/20210216175957_templates_mattermost_active.yml b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
index 9e472a1cb54..ced52649fd3 100644
--- a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_mattermost_active
 description: Count of active service templates for Mattermost
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
index fedc53d1944..519039cb6c2 100644
--- a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_mattermost_active
 description: Count of active instance-level integrations for Mattermost
 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_all/20210216180001_projects_inheriting_mattermost_active.yml b/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
index 536586a5e62..40a9e3f3eac 100644
--- a/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_mattermost_active
 description: Count of active projects inheriting integrations for Mattermost
 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_all/20210216180003_groups_inheriting_mattermost_active.yml b/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
index 9ceaa7c4a1c..eea105726c1 100644
--- a/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_mattermost_active
 description: Count of active groups inheriting integrations for Mattermost
 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_all/20210216180005_projects_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
index 8204da004d8..36cdffa264b 100644
--- a/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_mattermost_slash_commands_active
 description: Count of projects with active integrations for Mattermost (slash commands)
 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_all/20210216180006_groups_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
index 80b38b68eff..5356bbad505 100644
--- a/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_mattermost_slash_commands_active
 description: Count of groups with active integrations for Mattermost (slash commands)
 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_all/20210216180008_templates_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
index 97a8dccd834..9851fc82dcd 100644
--- a/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_mattermost_slash_commands_active
 description: Count of active service templates for Mattermost (slash commands)
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
index 6ad05101cbf..08026f0a267 100644
--- a/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_mattermost_slash_commands_active
 description: Count of active instance-level integrations for Mattermost (slash commands)
 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_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
index 01e97fa6ec3..08ea0768dcd 100644
--- a/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
@@ -5,7 +5,7 @@ description: Count of active projects inheriting integrations for Mattermost (sl
   commands)
 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_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
index ebedb6796b6..0458c912d4f 100644
--- a/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
@@ -5,7 +5,7 @@ description: Count of active groups inheriting integrations for Mattermost (slas
   commands)
 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_all/20210216180016_projects_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
index 9306aca0d2d..60dece28890 100644
--- a/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_microsoft_teams_active
 description: Count of projects with active integrations for Microsoft Teams
 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_all/20210216180018_groups_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
index 71b6ba02769..b6ff5d7e4a3 100644
--- a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_microsoft_teams_active
 description: Count of groups with active integrations for Microsoft Teams
 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_all/20210216180019_templates_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
index 1fed89e7932..f3b96753b7b 100644
--- a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_microsoft_teams_active
 description: Count of active service templates for Microsoft Teams
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
index d58b7483f1f..04c89b9544c 100644
--- a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_microsoft_teams_active
 description: Count of active instance-level integrations for Microsoft Teams
 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_all/20210216180023_projects_inheriting_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
index 2135727416d..0a9c6e8f2d5 100644
--- a/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_microsoft_teams_active
 description: Count of active projects inheriting integrations for Microsoft Teams
 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_all/20210216180025_groups_inheriting_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
index 5e16c68d9d9..430438fa682 100644
--- a/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_microsoft_teams_active
 description: Count of active groups inheriting integrations for Microsoft Teams
 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_all/20210216180027_projects_packagist_active.yml b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
index cff969cb8bb..2d6da6dd87c 100644
--- a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_packagist_active
 description: Count of projects with active integrations for Packagist
 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_all/20210216180029_groups_packagist_active.yml b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
index 1f97e3104c8..72d22778e35 100644
--- a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_packagist_active
 description: Count of groups with active integrations for Packagist
 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_all/20210216180030_templates_packagist_active.yml b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
index 75c4f0f2428..83e0d46c6b8 100644
--- a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_packagist_active
 description: Count of active service templates for Packagist
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
index eb3492ae263..f79210d6870 100644
--- a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_packagist_active
 description: Count of active instance-level integrations for Packagist
 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_all/20210216180034_projects_inheriting_packagist_active.yml b/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
index 35b79aad0b7..0dfdbd5b610 100644
--- a/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_packagist_active
 description: Count of active projects inheriting integrations for Packagist
 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_all/20210216180036_groups_inheriting_packagist_active.yml b/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
index 6b182ca55e7..21b7b80ec17 100644
--- a/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_packagist_active
 description: Count of active groups inheriting integrations for Packagist
 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_all/20210216180038_projects_pipelines_email_active.yml b/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
index 61555020204..b1f315903a6 100644
--- a/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_pipelines_email_active
 description: Count of projects with active integrations for Pipeline Emails
 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_all/20210216180040_groups_pipelines_email_active.yml b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
index 035bcf7d1b2..b3e5ff8ea4c 100644
--- a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_pipelines_email_active
 description: Count of groups with active integrations for Pipeline Emails
 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_all/20210216180041_templates_pipelines_email_active.yml b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
index 74629749687..ad3ed4311ff 100644
--- a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_pipelines_email_active
 description: Count of active service templates for Pipeline Emails
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
index 8c93ccf8d3d..c815050bec2 100644
--- a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_pipelines_email_active
 description: Count of active instance-level integrations for Pipeline Emails
 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_all/20210216180045_projects_inheriting_pipelines_email_active.yml b/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
index 68c59a66251..04cff98babb 100644
--- a/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_pipelines_email_active
 description: Count of active projects inheriting integrations for Pipeline Emails
 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_all/20210216180047_groups_inheriting_pipelines_email_active.yml b/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
index c05c227723d..1408f2084b8 100644
--- a/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_pipelines_email_active
 description: Count of active groups inheriting integrations for Pipeline Emails
 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_all/20210216180049_projects_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
index afa3609ae5b..312e0c0dd93 100644
--- a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_pivotaltracker_active
 description: Count of projects with active integrations for Pivotal Tracker
 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_all/20210216180051_groups_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
index 487b55d438e..2d1d3110957 100644
--- a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_pivotaltracker_active
 description: Count of groups with active integrations for Pivotal Tracker
 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_all/20210216180052_templates_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
index abc6227f431..338fa4f6adc 100644
--- a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_pivotaltracker_active
 description: Count of active service templates for Pivotal Tracker
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
index 6334dcf7ea0..8e6590c031c 100644
--- a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_pivotaltracker_active
 description: Count of active instance-level integrations for Pivotal Tracker
 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_all/20210216180056_projects_inheriting_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
index 15d298ab409..14f61d6c3e2 100644
--- a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_pivotaltracker_active
 description: Count of active projects inheriting integrations for Pivotal Tracker
 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_all/20210216180058_groups_inheriting_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
index c201fc24426..9dfa4d23021 100644
--- a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_pivotaltracker_active
 description: Count of active groups inheriting integrations for Pivotal Tracker
 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_all/20210216180100_projects_pushover_active.yml b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
index 1e8a1a69a13..85f9bfdf6c6 100644
--- a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_pushover_active
 description: Count of projects with active integrations for Pushover
 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_all/20210216180102_groups_pushover_active.yml b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
index bf2d9691718..ab43af5212f 100644
--- a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_pushover_active
 description: Count of groups with active integrations for Pushover
 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_all/20210216180104_templates_pushover_active.yml b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
index 9580fe01068..7ba07c02ded 100644
--- a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_pushover_active
 description: Count of active service templates for Pushover
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
index 97f79e00bbb..362873d1d7b 100644
--- a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_pushover_active
 description: Count of active instance-level integrations for Pushover
 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_all/20210216180107_projects_inheriting_pushover_active.yml b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
index 78ee7710012..b8c567b02bf 100644
--- a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_pushover_active
 description: Count of active projects inheriting integrations for Pushover
 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_all/20210216180109_groups_inheriting_pushover_active.yml b/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
index bc303da80b2..a587a6ab81c 100644
--- a/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_pushover_active
 description: Count of active groups inheriting integrations for Pushover
 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_all/20210216180111_projects_redmine_active.yml b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
index 6ce6e0e40a3..bcb72acdf48 100644
--- a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_redmine_active
 description: Count of projects with active integrations for Redmine
 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_all/20210216180113_groups_redmine_active.yml b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
index c4890014899..ab31eb0ec82 100644
--- a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_redmine_active
 description: Count of groups with active integrations for Redmine
 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_all/20210216180115_templates_redmine_active.yml b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
index 47ba5ed946b..7bddca755ec 100644
--- a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_redmine_active
 description: Count of active service templates for Redmine
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
index 9d9de8d5f76..2e1cd17c20f 100644
--- a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_redmine_active
 description: Count of active instance-level integrations for Redmine
 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_all/20210216180118_projects_inheriting_redmine_active.yml b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
index 396e007dcad..ba6aacb1d0a 100644
--- a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_redmine_active
 description: Count of active projects inheriting integrations for Redmine
 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_all/20210216180120_groups_inheriting_redmine_active.yml b/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
index 260b4059958..c219ea9aa92 100644
--- a/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_redmine_active
 description: Count of active groups inheriting integrations for Redmine
 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_all/20210216180122_projects_slack_active.yml b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
index 781fabdea25..206d36548ad 100644
--- a/config/metrics/counts_all/20210216180122_projects_slack_active.yml
+++ b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_slack_active
 description: Count of projects with active integrations for Slack
 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_all/20210216180124_groups_slack_active.yml b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
index 3d33c9c941c..91bf70daa37 100644
--- a/config/metrics/counts_all/20210216180124_groups_slack_active.yml
+++ b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_slack_active
 description: Count of groups with active integrations for Slack
 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_all/20210216180126_templates_slack_active.yml b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
index 792c965216e..aa90f12ab18 100644
--- a/config/metrics/counts_all/20210216180126_templates_slack_active.yml
+++ b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_slack_active
 description: Count of active service templates for Slack
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180127_instances_slack_active.yml b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
index badd214e967..931404189d1 100644
--- a/config/metrics/counts_all/20210216180127_instances_slack_active.yml
+++ b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_slack_active
 description: Count of active instance-level integrations for Slack
 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_all/20210216180129_projects_inheriting_slack_active.yml b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
index c2ffb561f59..84552e83be8 100644
--- a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_slack_active
 description: Count of active projects inheriting integrations for Slack
 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_all/20210216180131_groups_inheriting_slack_active.yml b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
index 98478a5141e..ec48bd47db0 100644
--- a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_slack_active
 description: Count of active groups inheriting integrations for Slack
 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_all/20210216180133_projects_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
index a3bb1984b6a..790872db206 100644
--- a/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_slack_slash_commands_active
 description: Count of projects with active integrations for Slack (slash commands)
 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_all/20210216180135_groups_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
index 8a57b153de4..5a820ea6ae7 100644
--- a/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_slack_slash_commands_active
 description: Count of groups with active integrations for Slack (slash commands)
 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_all/20210216180137_templates_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
index 38bc6959318..1718564975d 100644
--- a/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_slack_slash_commands_active
 description: Count of active service templates for Slack (slash commands)
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
index 05ef50c0704..9f6da9f0e7f 100644
--- a/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_slack_slash_commands_active
 description: Count of active instance-level integrations for Slack (slash commands)
 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_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
index 256e8460570..7e8f209f625 100644
--- a/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_slack_slash_commands_active
 description: Count of active projects inheriting integrations for Slack (slash commands)
 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_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
index 514176e1d69..4dfed91dc58 100644
--- a/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_slack_slash_commands_active
 description: Count of active groups inheriting integrations for Slack (slash commands)
 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_all/20210216180144_projects_teamcity_active.yml b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
index f2646e8833f..ad8d1afcc8e 100644
--- a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_teamcity_active
 description: Count of projects with active integrations for Teamcity CI
 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_all/20210216180146_groups_teamcity_active.yml b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
index 38f02ab6471..20deac7fe75 100644
--- a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_teamcity_active
 description: Count of groups with active integrations for Teamcity CI
 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_all/20210216180148_templates_teamcity_active.yml b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
index 63e8285e220..e1f01e57a31 100644
--- a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_teamcity_active
 description: Count of active service templates for Teamcity CI
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
index e79ea145ec9..32404539b74 100644
--- a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_teamcity_active
 description: Count of active instance-level integrations for Teamcity CI
 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_all/20210216180151_projects_inheriting_teamcity_active.yml b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
index 189211686a7..daddf5ca1db 100644
--- a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_teamcity_active
 description: Count of active projects inheriting integrations for Teamcity CI
 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_all/20210216180153_groups_inheriting_teamcity_active.yml b/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
index b99e26f4394..53879bc7462 100644
--- a/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_teamcity_active
 description: Count of active groups inheriting integrations for Teamcity CI
 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_all/20210216180155_projects_unify_circuit_active.yml b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
index f6e854b241d..3b678d43017 100644
--- a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_unify_circuit_active
 description: Count of projects with active integrations for Unifiy Circuit
 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_all/20210216180157_groups_unify_circuit_active.yml b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
index 278260d1aaa..4d40f5a473d 100644
--- a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_unify_circuit_active
 description: Count of groups with active integrations for Unifiy Circuit
 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_all/20210216180159_templates_unify_circuit_active.yml b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
index 10c7b23a308..6e7c83ed6fc 100644
--- a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_unify_circuit_active
 description: Count of active service templates for Unifiy Circuit
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
index 89e36459000..74f90bf006c 100644
--- a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_unify_circuit_active
 description: Count of active instance-level integrations for Unifiy Circuit
 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_all/20210216180203_projects_inheriting_unify_circuit_active.yml b/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
index d053ad5183e..0f3c151d505 100644
--- a/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_unify_circuit_active
 description: Count of active projects inheriting integrations for Unifiy Circuit
 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_all/20210216180204_groups_inheriting_unify_circuit_active.yml b/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
index f7bc5ab4a9d..af114532491 100644
--- a/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_unify_circuit_active
 description: Count of active groups inheriting integrations for Unifiy Circuit
 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_all/20210216180206_projects_webex_teams_active.yml b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
index 95f4efbb24b..07f5c5d5ce1 100644
--- a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_webex_teams_active
 description: Count of projects with active integrations for Webex Teams
 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_all/20210216180208_groups_webex_teams_active.yml b/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
index aa1ad25479b..682e719a37c 100644
--- a/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_webex_teams_active
 description: Count of groups with active integrations for Webex Teams
 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_all/20210216180210_templates_webex_teams_active.yml b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
index 1e41a8170d4..ace629d4322 100644
--- a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_webex_teams_active
 description: Count of active service templates for Webex Teams
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml b/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
index 20bdf4f0616..2d75cb7bebe 100644
--- a/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_webex_teams_active
 description: Count of active instance-level integrations for Webex Teams
 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_all/20210216180214_projects_inheriting_webex_teams_active.yml b/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
index cb4e3a00dd7..b2527e738ca 100644
--- a/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_webex_teams_active
 description: Count of active projects inheriting integrations for Webex Teams
 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_all/20210216180215_groups_inheriting_webex_teams_active.yml b/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
index 38623c9f105..5a59e20a5af 100644
--- a/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_webex_teams_active
 description: Count of active groups inheriting integrations for Webex Teams
 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_all/20210216180217_projects_youtrack_active.yml b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
index 63addd163cd..3e65b2b28dd 100644
--- a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_youtrack_active
 description: Count of projects with active integrations for YouTrack
 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_all/20210216180219_groups_youtrack_active.yml b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
index 3261458496b..6c57b9e5c86 100644
--- a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_youtrack_active
 description: Count of groups with active integrations for YouTrack
 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_all/20210216180221_templates_youtrack_active.yml b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
index edd5aa07f59..252c1724c48 100644
--- a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_youtrack_active
 description: Count of active service templates for YouTrack
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
index 83844709763..e678f693ef4 100644
--- a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_youtrack_active
 description: Count of active instance-level integrations for YouTrack
 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_all/20210216180225_projects_inheriting_youtrack_active.yml b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
index cb0ff9b5cf2..ffeecb454d2 100644
--- a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_youtrack_active
 description: Count of active projects inheriting integrations for YouTrack
 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_all/20210216180226_groups_inheriting_youtrack_active.yml b/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
index 1a49783e7b6..c8874399e76 100644
--- a/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_youtrack_active
 description: Count of active groups inheriting integrations for YouTrack
 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_all/20210216180228_projects_jira_server_active.yml b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
index f53ca3bf5e4..752f280dab3 100644
--- a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
+++ b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_jira_server_active
 description: Count of active integrations with Jira Software (server)
 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_all/20210216180230_projects_jira_cloud_active.yml b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
index 7ad776bf919..ceea89b7035 100644
--- a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_jira_cloud_active
 description: Count of active integrations with Jira Cloud (Saas)
 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_all/20210216180232_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
index a94b2209a3b..c98c7526f16 100644
--- a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_jira_dvcs_cloud_active
 description: Count of active integrations with Jira Cloud (DVCS Connector)
 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_all/20210216180234_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
index 2f6d7defbb9..9179ec898f3 100644
--- a/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_jira_dvcs_server_active
 description: Count of active integrations with Jira Software (DVCS connector)
 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_all/20210216180239_personal_snippets.yml b/config/metrics/counts_all/20210216180239_personal_snippets.yml
index 35467ce30c4..146b3217514 100644
--- a/config/metrics/counts_all/20210216180239_personal_snippets.yml
+++ b/config/metrics/counts_all/20210216180239_personal_snippets.yml
@@ -4,7 +4,7 @@ key_path: counts.personal_snippets
 description: 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_all/20210216180241_project_snippets.yml b/config/metrics/counts_all/20210216180241_project_snippets.yml
index 61ed32e7de5..c60a82e9ef0 100644
--- a/config/metrics/counts_all/20210216180241_project_snippets.yml
+++ b/config/metrics/counts_all/20210216180241_project_snippets.yml
@@ -4,7 +4,7 @@ key_path: counts.project_snippets
 description: 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_all/20210216180242_web_ide_commits.yml b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
index 618e09027b5..3d1d416a7c2 100644
--- a/config/metrics/counts_all/20210216180242_web_ide_commits.yml
+++ b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
@@ -4,7 +4,7 @@ key_path: counts.web_ide_commits
 description: Count of commits made 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_all/20210216180244_web_ide_views.yml b/config/metrics/counts_all/20210216180244_web_ide_views.yml
index cac6e315d6d..7bc32b3dbc9 100644
--- a/config/metrics/counts_all/20210216180244_web_ide_views.yml
+++ b/config/metrics/counts_all/20210216180244_web_ide_views.yml
@@ -4,7 +4,7 @@ key_path: counts.web_ide_views
 description: Count of views of 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_all/20210216180246_web_ide_merge_requests.yml b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
index 60281e0b57b..eb02d98dc85 100644
--- a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
@@ -4,7 +4,7 @@ key_path: counts.web_ide_merge_requests
 description: Count of merge requests created 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_all/20210216180248_web_ide_previews.yml b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
index 249654a68fd..4d581fc7f7e 100644
--- a/config/metrics/counts_all/20210216180248_web_ide_previews.yml
+++ b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
@@ -4,7 +4,7 @@ key_path: counts.web_ide_previews
 description: Count of Live Preview tab views in 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_all/20210216180250_web_ide_terminals.yml b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
index d674e379091..e8c1f425639 100644
--- a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
+++ b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
@@ -4,7 +4,7 @@ key_path: counts.web_ide_terminals
 description: Count of Web Terminal tab views in 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_all/20210216180252_web_ide_pipelines.yml b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
index bd2e3a97c88..ae891775bf9 100644
--- a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
+++ b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
@@ -4,7 +4,7 @@ key_path: counts.web_ide_pipelines
 description: Count of Pipeline tab views in 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_all/20210216180253_snippet_comment.yml b/config/metrics/counts_all/20210216180253_snippet_comment.yml
index e28994afad8..f01f62f361d 100644
--- a/config/metrics/counts_all/20210216180253_snippet_comment.yml
+++ b/config/metrics/counts_all/20210216180253_snippet_comment.yml
@@ -4,7 +4,7 @@ key_path: counts.snippet_comment
 description: Count of comments on 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_all/20210216180255_snippet_create.yml b/config/metrics/counts_all/20210216180255_snippet_create.yml
index 5afc32bd5b1..7cea58039e1 100644
--- a/config/metrics/counts_all/20210216180255_snippet_create.yml
+++ b/config/metrics/counts_all/20210216180255_snippet_create.yml
@@ -4,7 +4,7 @@ key_path: counts.snippet_create
 description: Count of newly created 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_all/20210216180257_snippet_update.yml b/config/metrics/counts_all/20210216180257_snippet_update.yml
index 462daa9e4da..5cb80f5e830 100644
--- a/config/metrics/counts_all/20210216180257_snippet_update.yml
+++ b/config/metrics/counts_all/20210216180257_snippet_update.yml
@@ -4,7 +4,7 @@ key_path: counts.snippet_update
 description: Count of updates to existing 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_all/20210216180259_static_site_editor_views.yml b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
index 3dad2082894..f80d80ff42e 100644
--- a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
+++ b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
@@ -4,7 +4,7 @@ key_path: counts.static_site_editor_views
 description: Count of Static Site Editor views
 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_all/20210216180301_static_site_editor_commits.yml b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
index eef5102a070..f2fd1b12e1f 100644
--- a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
+++ b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
@@ -4,7 +4,7 @@ key_path: counts.static_site_editor_commits
 description: Count of commits created from 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_all/20210216180303_static_site_editor_merge_requests.yml b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
index 01f0fee9a58..149ff63703d 100644
--- a/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
@@ -4,7 +4,7 @@ key_path: counts.static_site_editor_merge_requests
 description: Count of merge requests created via 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_all/20210216180304_user_preferences_user_gitpod_enabled.yml b/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
index b24b8075439..7fa03fd335e 100644
--- a/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
+++ b/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
@@ -4,7 +4,7 @@ key_path: counts.user_preferences_user_gitpod_enabled
 description: Count of users with the GitPod integration enabled
 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_all/20210216180306_snippets.yml b/config/metrics/counts_all/20210216180306_snippets.yml
index 5945b8925aa..08344a43f39 100644
--- a/config/metrics/counts_all/20210216180306_snippets.yml
+++ b/config/metrics/counts_all/20210216180306_snippets.yml
@@ -4,7 +4,7 @@ key_path: counts.snippets
 description: 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_all/20210216180316_snippets.yml b/config/metrics/counts_all/20210216180316_snippets.yml
index 2c6f32afcae..6196e159588 100644
--- a/config/metrics/counts_all/20210216180316_snippets.yml
+++ b/config/metrics/counts_all/20210216180316_snippets.yml
@@ -5,7 +5,7 @@ name: count_distinct_author_id_from_snippets
 description: Count of distinct author_id from 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_all/20210216180410_pool_repositories.yml b/config/metrics/counts_all/20210216180410_pool_repositories.yml
index 71d2763685b..1e5938b6eef 100644
--- a/config/metrics/counts_all/20210216180410_pool_repositories.yml
+++ b/config/metrics/counts_all/20210216180410_pool_repositories.yml
@@ -4,7 +4,7 @@ key_path: counts.pool_repositories
 description: Count of unique object pool repositories for fork deduplication
 product_section: dev
 product_stage: create
-product_group: group::gitaly
+product_group: gitaly
 product_category: gitaly
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180413_all_searches.yml b/config/metrics/counts_all/20210216180413_all_searches.yml
index cf19868b47f..2f45e0c6e20 100644
--- a/config/metrics/counts_all/20210216180413_all_searches.yml
+++ b/config/metrics/counts_all/20210216180413_all_searches.yml
@@ -5,7 +5,7 @@ description: Total Searches for All Basic Search and Advanced Search in self-man
   and SaaS
 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_all/20210216180414_navbar_searches.yml b/config/metrics/counts_all/20210216180414_navbar_searches.yml
index 118ce95550d..b2af79bb43c 100644
--- a/config/metrics/counts_all/20210216180414_navbar_searches.yml
+++ b/config/metrics/counts_all/20210216180414_navbar_searches.yml
@@ -5,7 +5,7 @@ description: Total Searches using the navbar for All Basic Search and Advanced S
   in self-managed and SaaS
 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_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml b/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
index 14c96ec488c..640f5798d87 100644
--- a/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
+++ b/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
@@ -4,7 +4,7 @@ key_path: counts.issues_created_from_gitlab_error_tracking_ui
 description: Count of issues manually created from the GitLab UI on Sentry errors
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: error_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml b/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
index dd5b6d74486..7bdb4b65b29 100644
--- a/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
+++ b/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
@@ -4,7 +4,7 @@ key_path: counts.issues_with_associated_zoom_link
 description: Count of issues where a user has linked a Zoom meeting
 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_all/20210216180438_issues_using_zoom_quick_actions.yml b/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
index 680d1931eb9..6a0d68c289d 100644
--- a/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
+++ b/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
@@ -5,7 +5,7 @@ description: Count of issues where a user have added AND removed a zoom meeting
   slash commands
 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_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml b/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
index 7c4c973c370..48782412f7b 100644
--- a/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
+++ b/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
@@ -4,7 +4,7 @@ key_path: counts.issues_with_embedded_grafana_charts_approx
 description: Count of issues where a user has embedded a Grafana chart
 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_all/20210216180441_issues_created_from_alerts.yml b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
index 2b3db17c271..7b46d786a7a 100644
--- a/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
+++ b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
@@ -4,7 +4,7 @@ key_path: counts.issues_created_from_alerts
 description: Count of issues created automatically on alerts from GitLab-Managed Prometheus
 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_all/20210216180443_issues_created_gitlab_alerts.yml b/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
index 0f09d09a8ac..c53df182d94 100644
--- a/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
+++ b/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
@@ -4,7 +4,7 @@ key_path: counts.issues_created_gitlab_alerts
 description: Count of all issues created from GitLab alerts (bot and non-bot)
 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_all/20210216180445_issues_created_manually_from_alerts.yml b/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
index d5f0cfbb02f..1cd832617b2 100644
--- a/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
+++ b/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
@@ -4,7 +4,7 @@ key_path: counts.issues_created_manually_from_alerts
 description: Count of issues created manually by non-bot users from GitLab alerts
 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_all/20210216180447_incident_issues.yml b/config/metrics/counts_all/20210216180447_incident_issues.yml
index b47ba495373..33726405845 100644
--- a/config/metrics/counts_all/20210216180447_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180447_incident_issues.yml
@@ -4,7 +4,7 @@ key_path: counts.incident_issues
 description: Count of incidents (issues where issue_type=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_all/20210216180449_alert_bot_incident_issues.yml b/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
index 3f43709e753..83c77355282 100644
--- a/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
@@ -4,7 +4,7 @@ key_path: counts.alert_bot_incident_issues
 description: Count of issues created by the alert bot automatically
 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_all/20210216180451_incident_labeled_issues.yml b/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
index 635dcd57168..e734fbc6735 100644
--- a/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
+++ b/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
@@ -4,7 +4,7 @@ key_path: counts.incident_labeled_issues
 description: Count of all issues with the label=incident
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: incident_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
index 763ecb49e55..ee200720ad1 100644
--- a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
+++ b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_creating_incidents
 description: Counts of Projects that have incident issues, regardless of status.
 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_all/20210216180454_projects_with_error_tracking_enabled.yml b/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
index 1d2d9bf518c..965b16e77f5 100644
--- a/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_error_tracking_enabled
 description: Count of projects that have enabled Error tracking via Sentry
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: error_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml b/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
index 609760e25c6..741a523e113 100644
--- a/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
+++ b/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_alerts_service_enabled
 description: Count of projects that have enabled the Alerts service
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: incident_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
index 9b85ad8d146..863f2bc63c3 100644
--- a/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
+++ b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_alerts_created
 description: Count of projects with alerts created in given time period
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: alert_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml b/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
index 44301e6a5bc..4a9ffeb2c2a 100644
--- a/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
+++ b/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_enabled_alert_integrations
 description: Count of projects with at least 1 enabled integration
 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_all/20210216180517_projects_with_error_tracking_enabled.yml b/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
index fc8c5d59eea..d684c6dc71c 100644
--- a/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.projects_with_error_tracking_enabled
 description: Projects where error tracking is enabled
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: error_tracking
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
index 627328016e2..7b6ca1dce80 100644
--- a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
+++ b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.projects_with_incidents
 description: Count of unique projects with 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_all/20210216180520_projects_with_alert_incidents.yml b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
index 64844280a58..50b2b6307d9 100644
--- a/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.projects_with_alert_incidents
 description: Count of unique projects with an incident from 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_all/20210216180628_projects_imported_from_github.yml b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
index c8732efd549..a55600b2b7d 100644
--- a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
@@ -4,7 +4,7 @@ key_path: counts.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_all/20210216180630_projects_imported_from_github.yml b/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
index 360bb66dee8..d5226578de5 100644
--- a/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.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_all/20210216180632_unique_users_all_imports.yml b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
index df9c9d99eb1..5bfc7ea3069 100644
--- a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
+++ b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.unique_users_all_imports
 description: Distinct count of users that triggered any kind of 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_all/20210216180634_gitlab.yml b/config/metrics/counts_all/20210216180634_gitlab.yml
index 491095d836e..f908af91de7 100644
--- a/config/metrics/counts_all/20210216180634_gitlab.yml
+++ b/config/metrics/counts_all/20210216180634_gitlab.yml
@@ -5,7 +5,7 @@ description: Distinct count of users that triggered an import using the Group Mi
   tool
 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_all/20210216180636_gitlab_v1.yml b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
index d390645eada..b1b6e20e092 100644
--- a/config/metrics/counts_all/20210216180636_gitlab_v1.yml
+++ b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.bulk_imports.gitlab_v1
 description: Count of imports 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_all/20210216180638_gitlab_project.yml b/config/metrics/counts_all/20210216180638_gitlab_project.yml
index a3991441a70..5635d3918f4 100644
--- a/config/metrics/counts_all/20210216180638_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180638_gitlab_project.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.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_all/20210216180639_gitlab.yml b/config/metrics/counts_all/20210216180639_gitlab.yml
index 3497675a00c..ffee62ebbf7 100644
--- a/config/metrics/counts_all/20210216180639_gitlab.yml
+++ b/config/metrics/counts_all/20210216180639_gitlab.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.project_imports.gitlab
 description: Count of projects imported from GitLab.com
 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_all/20210216180641_github.yml b/config/metrics/counts_all/20210216180641_github.yml
index 930c96898de..72f7a33beb6 100644
--- a/config/metrics/counts_all/20210216180641_github.yml
+++ b/config/metrics/counts_all/20210216180641_github.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.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_all/20210216180643_bitbucket.yml b/config/metrics/counts_all/20210216180643_bitbucket.yml
index 2e612b09057..86f7d15eea5 100644
--- a/config/metrics/counts_all/20210216180643_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180643_bitbucket.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.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_all/20210216180645_bitbucket_server.yml b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
index fc5df480f75..c37009c4ed5 100644
--- a/config/metrics/counts_all/20210216180645_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.project_imports.bitbucket_server
 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_all/20210216180647_gitea.yml b/config/metrics/counts_all/20210216180647_gitea.yml
index 584d0f26cb1..a7d80f15686 100644
--- a/config/metrics/counts_all/20210216180647_gitea.yml
+++ b/config/metrics/counts_all/20210216180647_gitea.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.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_all/20210216180649_git.yml b/config/metrics/counts_all/20210216180649_git.yml
index d5569d2a56e..9851e1b97eb 100644
--- a/config/metrics/counts_all/20210216180649_git.yml
+++ b/config/metrics/counts_all/20210216180649_git.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.project_imports.git
 description: Count of projects imported by URL
 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_all/20210216180650_manifest.yml b/config/metrics/counts_all/20210216180650_manifest.yml
index e6578f840bb..a76dc28c9c5 100644
--- a/config/metrics/counts_all/20210216180650_manifest.yml
+++ b/config/metrics/counts_all/20210216180650_manifest.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.project_imports.manifest
 description: Count of projects imported using manifst 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_all/20210216180652_gitlab_migration.yml b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
index 7e9e9b6d261..a563b3d53d1 100644
--- a/config/metrics/counts_all/20210216180652_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.project_imports.gitlab_migration
 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_all/20210216180654_jira.yml b/config/metrics/counts_all/20210216180654_jira.yml
index 890e4b46391..cf33c7f8128 100644
--- a/config/metrics/counts_all/20210216180654_jira.yml
+++ b/config/metrics/counts_all/20210216180654_jira.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.issue_imports.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: active
diff --git a/config/metrics/counts_all/20210216180656_fogbugz.yml b/config/metrics/counts_all/20210216180656_fogbugz.yml
index ef5baf27291..d51591d0297 100644
--- a/config/metrics/counts_all/20210216180656_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180656_fogbugz.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.issue_imports.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: active
diff --git a/config/metrics/counts_all/20210216180658_phabricator.yml b/config/metrics/counts_all/20210216180658_phabricator.yml
index 1f48180200b..834322726fa 100644
--- a/config/metrics/counts_all/20210216180658_phabricator.yml
+++ b/config/metrics/counts_all/20210216180658_phabricator.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.issue_imports.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: active
diff --git a/config/metrics/counts_all/20210216180700_csv.yml b/config/metrics/counts_all/20210216180700_csv.yml
index 78322ba56b2..e5ca3cbc7e2 100644
--- a/config/metrics/counts_all/20210216180700_csv.yml
+++ b/config/metrics/counts_all/20210216180700_csv.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.issue_imports.csv
 description: Count of (attempted) imports from csv files
 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_all/20210216180702_group_import.yml b/config/metrics/counts_all/20210216180702_group_import.yml
index 68042d4a4a3..ed0b3b9d032 100644
--- a/config/metrics/counts_all/20210216180702_group_import.yml
+++ b/config/metrics/counts_all/20210216180702_group_import.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.group_imports.group_import
 description: Count of groups imported using Group 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_all/20210216180703_gitlab_migration.yml b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
index a4aca8f7859..b5b6f0a73b5 100644
--- a/config/metrics/counts_all/20210216180703_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.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_all/20210216180705_total.yml b/config/metrics/counts_all/20210216180705_total.yml
index a159fe43199..22f46b6bf04 100644
--- a/config/metrics/counts_all/20210216180705_total.yml
+++ b/config/metrics/counts_all/20210216180705_total.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.projects_imported.total
 description: Total count of all projects imported with import_source NOT NULL
 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_all/20210216180707_gitlab_project.yml b/config/metrics/counts_all/20210216180707_gitlab_project.yml
index 3627fe7c13f..76c17b6c81d 100644
--- a/config/metrics/counts_all/20210216180707_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180707_gitlab_project.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.projects_imported.gitlab_project
 description: Distinct count of users that imported projects 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_all/20210216180709_gitlab.yml b/config/metrics/counts_all/20210216180709_gitlab.yml
index 97826963cef..28495cc221a 100644
--- a/config/metrics/counts_all/20210216180709_gitlab.yml
+++ b/config/metrics/counts_all/20210216180709_gitlab.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.projects_imported.gitlab
 description: Distinct count of users that imported projects from GitLab.com
 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_all/20210216180711_github.yml b/config/metrics/counts_all/20210216180711_github.yml
index 1df68631a35..db8655eba39 100644
--- a/config/metrics/counts_all/20210216180711_github.yml
+++ b/config/metrics/counts_all/20210216180711_github.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.projects_imported.github
 description: Distinct count of users that imported projects 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_all/20210216180713_bitbucket.yml b/config/metrics/counts_all/20210216180713_bitbucket.yml
index c2ad8aeb57b..d2dd844a237 100644
--- a/config/metrics/counts_all/20210216180713_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180713_bitbucket.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.projects_imported.bitbucket
 description: Distinct count of users that imported projects from Bitbucket Cloud
 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_all/20210216180715_bitbucket_server.yml b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
index d588f1f48cf..8110fc3e008 100644
--- a/config/metrics/counts_all/20210216180715_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.projects_imported.bitbucket_server
 description: Distinct count of users that imported projects 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_all/20210216180716_gitea.yml b/config/metrics/counts_all/20210216180716_gitea.yml
index 7e585cd6808..4a32e8e5ca1 100644
--- a/config/metrics/counts_all/20210216180716_gitea.yml
+++ b/config/metrics/counts_all/20210216180716_gitea.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.projects_imported.gitea
 description: Distinct count of users that imported projects 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_all/20210216180718_git.yml b/config/metrics/counts_all/20210216180718_git.yml
index 9e23899875a..f1ea4ca9441 100644
--- a/config/metrics/counts_all/20210216180718_git.yml
+++ b/config/metrics/counts_all/20210216180718_git.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.projects_imported.git
 description: Distinct count of users that imported projects using Import by URL
 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_all/20210216180720_manifest.yml b/config/metrics/counts_all/20210216180720_manifest.yml
index 07a5e2ce282..938ba0b48f4 100644
--- a/config/metrics/counts_all/20210216180720_manifest.yml
+++ b/config/metrics/counts_all/20210216180720_manifest.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.projects_imported.manifest
 description: Distinct count of users that imported projects using Manifest 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_all/20210216180722_jira.yml b/config/metrics/counts_all/20210216180722_jira.yml
index a069aa329a7..63b8b83f219 100644
--- a/config/metrics/counts_all/20210216180722_jira.yml
+++ b/config/metrics/counts_all/20210216180722_jira.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.issues_imported.jira
 description: Distinct count of users that imported issues into projects using 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_all/20210216180724_fogbugz.yml b/config/metrics/counts_all/20210216180724_fogbugz.yml
index ff1abeef151..618b647a931 100644
--- a/config/metrics/counts_all/20210216180724_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180724_fogbugz.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.issues_imported.fogbugz
 description: Distinct count of users that imported issues into projects using 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_all/20210216180726_phabricator.yml b/config/metrics/counts_all/20210216180726_phabricator.yml
index e7de4c560bd..0fa06ea3ab7 100644
--- a/config/metrics/counts_all/20210216180726_phabricator.yml
+++ b/config/metrics/counts_all/20210216180726_phabricator.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.issues_imported.phabricator
 description: Distinct count of users that imported issues into projects using 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_all/20210216180727_csv.yml b/config/metrics/counts_all/20210216180727_csv.yml
index a132f2e53c1..e700a0dbf8d 100644
--- a/config/metrics/counts_all/20210216180727_csv.yml
+++ b/config/metrics/counts_all/20210216180727_csv.yml
@@ -5,7 +5,7 @@ description: Distinct count of users that imported issues into projects using CS
   upload
 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_all/20210216180729_groups_imported.yml b/config/metrics/counts_all/20210216180729_groups_imported.yml
index 5631a1315e6..c7f0f128d83 100644
--- a/config/metrics/counts_all/20210216180729_groups_imported.yml
+++ b/config/metrics/counts_all/20210216180729_groups_imported.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.groups_imported
 description: Distinct count of users that imported groups using Group Import
 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_all/20210216180734_wiki_pages_create.yml b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
index e30c339d73c..675a9db7a7b 100644
--- a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
+++ b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
@@ -4,7 +4,7 @@ key_path: counts.wiki_pages_create
 description: Count of all Wiki pages created
 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_all/20210216180736_wiki_pages_update.yml b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
index de168835e07..c985d876c96 100644
--- a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
+++ b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
@@ -4,7 +4,7 @@ key_path: counts.wiki_pages_update
 description: Count of all Wiki page updates
 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_all/20210216180738_wiki_pages_delete.yml b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
index d9175cd64e8..6ac0825996c 100644
--- a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
+++ b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
@@ -4,7 +4,7 @@ key_path: counts.wiki_pages_delete
 description: Count of all Wiki pages deleted
 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_all/20210216180740_design_management_designs_create.yml b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
index 82575446cdc..42f06ef563f 100644
--- a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
+++ b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
@@ -4,7 +4,7 @@ key_path: counts.design_management_designs_create
 description: Number of designs that were created
 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_all/20210216180741_design_management_designs_update.yml b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
index 49894014da5..a4e526214aa 100644
--- a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
+++ b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
@@ -4,7 +4,7 @@ key_path: counts.design_management_designs_update
 description: Number of updates to designs
 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_all/20210216180743_design_management_designs_delete.yml b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
index 173c9522c39..4eff2b1b0ff 100644
--- a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
+++ b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
@@ -4,7 +4,7 @@ key_path: counts.design_management_designs_delete
 description: Number of designs that were deleted
 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_all/20210216180750_groups.yml b/config/metrics/counts_all/20210216180750_groups.yml
index 2ed6e0f7da2..e8298cb7fbc 100644
--- a/config/metrics/counts_all/20210216180750_groups.yml
+++ b/config/metrics/counts_all/20210216180750_groups.yml
@@ -4,7 +4,7 @@ key_path: counts.groups
 description: Total count of groups as of usage ping snapshot
 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_all/20210216180752_keys.yml b/config/metrics/counts_all/20210216180752_keys.yml
index 546bc303314..f6de1a1fdd1 100644
--- a/config/metrics/counts_all/20210216180752_keys.yml
+++ b/config/metrics/counts_all/20210216180752_keys.yml
@@ -4,7 +4,7 @@ key_path: counts.keys
 description: Number of keys.
 product_section: dev
 product_stage: managed
-product_group: group::authentication and authorization
+product_group: authentication_and_authorization
 product_category: authentication_and_authorization
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180754_events.yml b/config/metrics/counts_all/20210216180754_events.yml
index 85875448f00..068ff246f97 100644
--- a/config/metrics/counts_all/20210216180754_events.yml
+++ b/config/metrics/counts_all/20210216180754_events.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.events
 description: Number of distinct users who have generated a manage event
 product_section: dev
 product_stage: manage
-product_group: group::manage
+product_group: manage
 product_category:
 value_type: number
 status: broken
diff --git a/config/metrics/counts_all/20210216180756_groups.yml b/config/metrics/counts_all/20210216180756_groups.yml
index 0aaffbc9eae..cacd3061278 100644
--- a/config/metrics/counts_all/20210216180756_groups.yml
+++ b/config/metrics/counts_all/20210216180756_groups.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.groups
 description: Number of users who are group members.
 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_all/20210216180758_users_created.yml b/config/metrics/counts_all/20210216180758_users_created.yml
index 9567dbf5e23..c34c1cfe264 100644
--- a/config/metrics/counts_all/20210216180758_users_created.yml
+++ b/config/metrics/counts_all/20210216180758_users_created.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.users_created
 description: Number of users
 product_section: dev
 product_stage: manage
-product_group: group::authentication and authorization
+product_group: authentication_and_authorization
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
index 0e2ac43de54..35117f6217d 100644
--- a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
+++ b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
@@ -4,7 +4,7 @@ key_path: counts.grafana_integrated_projects
 description: Total Grafana integrations attached to projects
 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_all/20210216180929_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
index 87668ca0e4f..106ecfa4483 100644
--- a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
@@ -4,10 +4,10 @@ key_path: counts.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: all
 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_all/20210216180931_projects_prometheus_active.yml b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
index c753ae06c09..112e7a493c0 100644
--- a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_prometheus_active
 description: Count of projects with active integrations for Prometheus
 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_all/20210216180933_groups_prometheus_active.yml b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
index 3cc8dcb47c8..92b913621e3 100644
--- a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_prometheus_active
 description: Count of groups with active integrations for Prometheus
 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_all/20210216180934_templates_prometheus_active.yml b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
index 9f8a24488ad..e71461d1a5a 100644
--- a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_prometheus_active
 description: Count of active service templates for Prometheus
 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_all/20210216180936_instances_prometheus_active.yml b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
index 7308e5c82b4..17cf56a6fc4 100644
--- a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_prometheus_active
 description: Count of active instance-level integrations for Prometheus
 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_all/20210216180938_projects_inheriting_prometheus_active.yml b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
index 32b59d9948a..9dbd83529d6 100644
--- a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_prometheus_active
 description: Count of active projects inheriting integrations for Prometheus
 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_all/20210216180940_groups_inheriting_prometheus_active.yml b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
index 0604fadab62..10a149c3ae8 100644
--- a/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_prometheus_active
 description: Count of active groups inheriting integrations for Prometheus
 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_all/20210216180942_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
index 3d00a873ea3..ae3909f78a4 100644
--- a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
@@ -4,7 +4,7 @@ key_path: counts.operations_dashboard_default_dashboard
 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_all/20210216180944_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
index c510f56b392..843f75ef12a 100644
--- a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
@@ -4,7 +4,7 @@ key_path: counts.operations_dashboard_users_with_projects_added
 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_all/20210216180945_clusters.yml b/config/metrics/counts_all/20210216180945_clusters.yml
index ef1694a274f..93fffedd2e6 100644
--- a/config/metrics/counts_all/20210216180945_clusters.yml
+++ b/config/metrics/counts_all/20210216180945_clusters.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.clusters
 description: Users creating clusters.
 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_all/20210216180947_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
index bf567337380..0148788f635 100644
--- a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.clusters_applications_prometheus
 description: Users creating clusters with Prometheus 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_all/20210216180949_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
index 618f0049e50..c3c840c6228 100644
--- a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.operations_dashboard_default_dashboard
 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_all/20210216180951_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
index 3532dc60ff0..62f472da341 100644
--- a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
@@ -4,10 +4,10 @@ key_path: usage_activity_by_stage.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: all
 data_source: database
 distribution:
@@ -18,3 +18,5 @@ tier:
 - premium
 - ultimate
 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_all/20210216180953_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
index 1f80f3a935d..b22402d2a1b 100644
--- a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.operations_dashboard_users_with_projec
 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_all/20210216181009_lfs_objects.yml b/config/metrics/counts_all/20210216181009_lfs_objects.yml
index 5b025ff4947..851281b799d 100644
--- a/config/metrics/counts_all/20210216181009_lfs_objects.yml
+++ b/config/metrics/counts_all/20210216181009_lfs_objects.yml
@@ -4,7 +4,7 @@ key_path: counts.lfs_objects
 description: Count of lfs objects
 product_section: ops
 product_stage: create
-product_group: group::create
+product_group: create
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181011_projects_with_packages.yml b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
index 554ed451d64..f2f7870cfc9 100644
--- a/config/metrics/counts_all/20210216181011_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_packages
 description: Projects with package registry enabled
 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_all/20210216181012_packages.yml b/config/metrics/counts_all/20210216181012_packages.yml
index 65cc8b20b0d..647e4dd3183 100644
--- a/config/metrics/counts_all/20210216181012_packages.yml
+++ b/config/metrics/counts_all/20210216181012_packages.yml
@@ -4,7 +4,7 @@ key_path: counts.packages
 description: The total number 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_all/20210216181014_projects_with_expiration_policy_disabled.yml b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
index 0a6e00a0006..1d71cc632c4 100644
--- a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
+++ b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_expiration_policy_disabled
 description: The number of projects with cleanup policy for tags turned off
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
index c21b1eeb2cc..c5e5e7fffd1 100644
--- a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
+++ b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_expiration_policy_enabled
 description: A count of projects with the cleanup policy for tags turned on
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
index 9b786709798..2a531707621 100644
--- a/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
+++ b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_1
 description: A count of projects with the cleanup policy set to keep 1 tag
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
index 92f242f0a1c..4e9df93f171 100644
--- a/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
+++ b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_5
 description: A count of projects with the cleanup policy set to keep 5 tags
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
index 0b2f360437e..da0e5006521 100644
--- a/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
+++ b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_10
 description: A count of projects with the cleanup policy set to keep 10 tags
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
index 756ddb1f11b..84bce062d63 100644
--- a/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
+++ b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_25
 description: A count of projects with the cleanup policy set to keep 25 tags
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
index 5b5b0d3734c..38579a1bdc2 100644
--- a/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
+++ b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_50
 description: A count of projects with the cleanup policy set to keep 50 tags
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml b/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
index 8b4ebb9b020..69c59dd2262 100644
--- a/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
+++ b/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_100
 description: A count of projects with the cleanup policy set to keep 100 tags
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
index d1033a11ea5..1694127fd2c 100644
--- a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
+++ b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_1d
 description: A count of projects with the cleanup policy set to run every day
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
index 9e8db324e41..a9f8ed70c94 100644
--- a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_7d
 description: A count of projects with the cleanup policy set to run every 7 days
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
index 19360edf23f..7afc773b713 100644
--- a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_14d
 description: A count of projects with the cleanup policy set to run every 14 days
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
index 946330fb339..b083411ab7f 100644
--- a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
+++ b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_1mo
 description: A count of projects with the cleanup policy set to run monthly
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
index c24f474379a..0df858b127d 100644
--- a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
+++ b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_3mo
 description: A count of projects with the cleanup policy set to run every 3 months
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
index 76f20bc31b6..bf1a98fd290 100644
--- a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
@@ -5,7 +5,7 @@ description: A count of projects with the cleanup policy set delete tags older t
   7 days
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
index 0f60e003840..31f7f6562e4 100644
--- a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
@@ -5,7 +5,7 @@ description: A count of projects with the cleanup policy set delete tags older t
   14 days
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
index 90d034f8294..577e9e60d56 100644
--- a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
+++ b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
@@ -5,7 +5,7 @@ description: A count of projects with the cleanup policy set delete tags older t
   30 days
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
index 6add782766a..3ef97b5a6f8 100644
--- a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
+++ b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
@@ -5,7 +5,7 @@ description: A count of projects with the cleanup policy set delete tags older t
   90 days
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
index 67c18c86aee..6a98e4ecfd8 100644
--- a/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
+++ b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
@@ -5,7 +5,7 @@ description: A count of projects with the cleanup policy with the number of tags
   keep unset
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
index 205f46dd8a2..d2be783a12a 100644
--- a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
+++ b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
@@ -5,7 +5,7 @@ description: A count of projects with the cleanup policy with the number of tags
   delete unset
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181051_vendor.yml b/config/metrics/counts_all/20210216181051_vendor.yml
index 82bf1d6393a..3ea154f5877 100644
--- a/config/metrics/counts_all/20210216181051_vendor.yml
+++ b/config/metrics/counts_all/20210216181051_vendor.yml
@@ -5,7 +5,7 @@ description: Identifies if a user is using an external container registry and wh
   type
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181055_projects_with_packages.yml b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
index cc2fa107b47..efee3ba55ce 100644
--- a/config/metrics/counts_all/20210216181055_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.package.projects_with_packages
 description: Projects with package registry enabled
 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_all/20210216181102_issues.yml b/config/metrics/counts_all/20210216181102_issues.yml
index b902437e2f9..894691e7880 100644
--- a/config/metrics/counts_all/20210216181102_issues.yml
+++ b/config/metrics/counts_all/20210216181102_issues.yml
@@ -4,7 +4,7 @@ key_path: counts.issues
 description: Count of Issues created
 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_all/20210216181104_label_lists.yml b/config/metrics/counts_all/20210216181104_label_lists.yml
index fd58d1866bb..80a18c67252 100644
--- a/config/metrics/counts_all/20210216181104_label_lists.yml
+++ b/config/metrics/counts_all/20210216181104_label_lists.yml
@@ -4,7 +4,7 @@ key_path: counts.label_lists
 description: Count of label lists created 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_all/20210216181108_milestones.yml b/config/metrics/counts_all/20210216181108_milestones.yml
index aa7c8f90f80..abeec87524c 100644
--- a/config/metrics/counts_all/20210216181108_milestones.yml
+++ b/config/metrics/counts_all/20210216181108_milestones.yml
@@ -4,7 +4,7 @@ key_path: counts.milestones
 description: Count of milestones created
 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_all/20210216181109_uploads.yml b/config/metrics/counts_all/20210216181109_uploads.yml
index 220009a2ff5..bd2dc41838f 100644
--- a/config/metrics/counts_all/20210216181109_uploads.yml
+++ b/config/metrics/counts_all/20210216181109_uploads.yml
@@ -4,7 +4,7 @@ key_path: counts.uploads
 description: Count of Uploads via Notes and Descriptions
 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_all/20210216181111_labels.yml b/config/metrics/counts_all/20210216181111_labels.yml
index 48980c7cba4..b91356054bb 100644
--- a/config/metrics/counts_all/20210216181111_labels.yml
+++ b/config/metrics/counts_all/20210216181111_labels.yml
@@ -4,7 +4,7 @@ key_path: counts.labels
 description: Count of 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_all/20210216181113_notes.yml b/config/metrics/counts_all/20210216181113_notes.yml
index 2d5d5c405cd..8a73c5f93b0 100644
--- a/config/metrics/counts_all/20210216181113_notes.yml
+++ b/config/metrics/counts_all/20210216181113_notes.yml
@@ -4,7 +4,7 @@ key_path: counts.notes
 description: Count of Notes across all objects that use them
 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_all/20210216181115_issues.yml b/config/metrics/counts_all/20210216181115_issues.yml
index f80ae26eea0..e7383e40f9d 100644
--- a/config/metrics/counts_all/20210216181115_issues.yml
+++ b/config/metrics/counts_all/20210216181115_issues.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.plan.issues
 description: Count of users creating 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_all/20210216181117_notes.yml b/config/metrics/counts_all/20210216181117_notes.yml
index e8cc952b05c..5f8a7097ec0 100644
--- a/config/metrics/counts_all/20210216181117_notes.yml
+++ b/config/metrics/counts_all/20210216181117_notes.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.plan.notes
 description: Count of users creating Notes 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_all/20210216181119_projects.yml b/config/metrics/counts_all/20210216181119_projects.yml
index e8bce2b79bf..31b315b6e12 100644
--- a/config/metrics/counts_all/20210216181119_projects.yml
+++ b/config/metrics/counts_all/20210216181119_projects.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.plan.projects
 description: Count of users 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_all/20210216181121_todos.yml b/config/metrics/counts_all/20210216181121_todos.yml
index e20fe6f7b84..c89cd1208c4 100644
--- a/config/metrics/counts_all/20210216181121_todos.yml
+++ b/config/metrics/counts_all/20210216181121_todos.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.plan.todos
 description: Count of users todos created
 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_all/20210216181122_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
index d57a1b6a052..e25512bf85f 100644
--- a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.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_all/20210216181124_service_desk_issues.yml b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
index 476d2fab058..4d2c933ea59 100644
--- a/config/metrics/counts_all/20210216181124_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.plan.service_desk_issues
 description: Count of service desk issues
 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_all/20210216181126_projects_jira_active.yml b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
index 63b13a17b67..2bd0cdf62c3 100644
--- a/config/metrics/counts_all/20210216181126_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.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_all/20210216181128_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
index 7e42a3e57a4..9d17fd23fde 100644
--- a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216181128_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_all/20210216181130_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
index 55d90e282c6..49747d3239c 100644
--- a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216181130_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_all/20210216181134_epics.yml b/config/metrics/counts_all/20210216181134_epics.yml
index 4b6a1ed0291..9f491a10552 100644
--- a/config/metrics/counts_all/20210216181134_epics.yml
+++ b/config/metrics/counts_all/20210216181134_epics.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.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_all/20210216181135_label_lists.yml b/config/metrics/counts_all/20210216181135_label_lists.yml
index 8bcabe8cd38..4a8714c16c6 100644
--- a/config/metrics/counts_all/20210216181135_label_lists.yml
+++ b/config/metrics/counts_all/20210216181135_label_lists.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.plan.label_lists
 description: Count of users 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_all/20210216181249_feature_flags.yml b/config/metrics/counts_all/20210216181249_feature_flags.yml
index 70e6e6c04eb..2b25ce6a32b 100644
--- a/config/metrics/counts_all/20210216181249_feature_flags.yml
+++ b/config/metrics/counts_all/20210216181249_feature_flags.yml
@@ -4,7 +4,7 @@ key_path: counts.feature_flags
 description: Number of feature flag toggles
 product_section: ops
 product_stage: release
-product_group: group::release
+product_group: release
 product_category: feature_flags
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181252_boards.yml b/config/metrics/counts_all/20210216181252_boards.yml
index 683fa274e63..6d4c41cd95e 100644
--- a/config/metrics/counts_all/20210216181252_boards.yml
+++ b/config/metrics/counts_all/20210216181252_boards.yml
@@ -4,7 +4,7 @@ key_path: counts.boards
 description: Count of Boards created
 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_all/20210216181254_projects.yml b/config/metrics/counts_all/20210216181254_projects.yml
index 00af8e92387..1327d016b9d 100644
--- a/config/metrics/counts_all/20210216181254_projects.yml
+++ b/config/metrics/counts_all/20210216181254_projects.yml
@@ -4,7 +4,7 @@ key_path: counts.projects
 description: Count of Projects created
 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_all/20210216181256_todos.yml b/config/metrics/counts_all/20210216181256_todos.yml
index 72932b9ec84..27edfc7527a 100644
--- a/config/metrics/counts_all/20210216181256_todos.yml
+++ b/config/metrics/counts_all/20210216181256_todos.yml
@@ -4,7 +4,7 @@ key_path: counts.todos
 description: Count of todos created
 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_all/20210216181258_jira_imports_total_imported_count.yml b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
index a4abbad0b7d..c38fc0bd081 100644
--- a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
+++ b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
@@ -4,7 +4,7 @@ key_path: counts.jira_imports_total_imported_count
 description: Count of Jira imports completed
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: jira_importer
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
index 3722c7ccaa4..0188ba1510b 100644
--- a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
+++ b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
@@ -4,7 +4,7 @@ key_path: counts.jira_imports_projects_count
 description: Count of Projects that imported Issues from Jira
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: jira_importer
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
index 312bbc1dff6..c67c7daa770 100644
--- a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
+++ b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
@@ -5,7 +5,7 @@ instrumentation_class: JiraImportsTotalImportedIssuesCountMetric
 description: Count of total issues imported via the Jira Importer
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: jira_importer
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181908_deploy_keys.yml b/config/metrics/counts_all/20210216181908_deploy_keys.yml
index 40cf2ceb97a..b160392c5ac 100644
--- a/config/metrics/counts_all/20210216181908_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216181908_deploy_keys.yml
@@ -4,7 +4,7 @@ key_path: counts.deploy_keys
 description: Count of deploy keys
 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_all/20210216181911_successful_deployments.yml b/config/metrics/counts_all/20210216181911_successful_deployments.yml
index dcaf37a62f3..b684cf0aa93 100644
--- a/config/metrics/counts_all/20210216181911_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181911_successful_deployments.yml
@@ -4,7 +4,7 @@ key_path: counts.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_all/20210216181912_failed_deployments.yml b/config/metrics/counts_all/20210216181912_failed_deployments.yml
index 0c3837e3f0b..605282e0ae0 100644
--- a/config/metrics/counts_all/20210216181912_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181912_failed_deployments.yml
@@ -4,7 +4,7 @@ key_path: counts.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_all/20210216181914_environments.yml b/config/metrics/counts_all/20210216181914_environments.yml
index ce6fb171f79..8985639f927 100644
--- a/config/metrics/counts_all/20210216181914_environments.yml
+++ b/config/metrics/counts_all/20210216181914_environments.yml
@@ -4,7 +4,7 @@ key_path: counts.environments
 description: Total available and stopped environments
 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_all/20210216181916_in_review_folder.yml b/config/metrics/counts_all/20210216181916_in_review_folder.yml
index 145f0a3ab02..eaebd12475c 100644
--- a/config/metrics/counts_all/20210216181916_in_review_folder.yml
+++ b/config/metrics/counts_all/20210216181916_in_review_folder.yml
@@ -4,7 +4,7 @@ key_path: counts.in_review_folder
 description: A number of environments with name review/*
 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_all/20210216181918_releases.yml b/config/metrics/counts_all/20210216181918_releases.yml
index edd72afffff..aff67e4e6e5 100644
--- a/config/metrics/counts_all/20210216181918_releases.yml
+++ b/config/metrics/counts_all/20210216181918_releases.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: counts.releases
 description: Count of releases
 product_section: ops
-product_stage: releases
-product_group: group::release
+product_stage: release
+product_group: release
 product_category: release_orchestration
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181926_deployments.yml b/config/metrics/counts_all/20210216181926_deployments.yml
index cabf887d72d..51650d645e8 100644
--- a/config/metrics/counts_all/20210216181926_deployments.yml
+++ b/config/metrics/counts_all/20210216181926_deployments.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.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_all/20210216181928_failed_deployments.yml b/config/metrics/counts_all/20210216181928_failed_deployments.yml
index d3208764244..670c7fb65cc 100644
--- a/config/metrics/counts_all/20210216181928_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181928_failed_deployments.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.release.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_all/20210216181930_releases.yml b/config/metrics/counts_all/20210216181930_releases.yml
index 7d3ba2eb218..b86e467b2d3 100644
--- a/config/metrics/counts_all/20210216181930_releases.yml
+++ b/config/metrics/counts_all/20210216181930_releases.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.release.releases
 description: Unique users creating release tags
 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_all/20210216181932_successful_deployments.yml b/config/metrics/counts_all/20210216181932_successful_deployments.yml
index e85b46027b4..003d5e8ef6f 100644
--- a/config/metrics/counts_all/20210216181932_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181932_successful_deployments.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.release.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_all/20210216181946_pages_domains.yml b/config/metrics/counts_all/20210216181946_pages_domains.yml
index cba92282125..8df4f3bd3a5 100644
--- a/config/metrics/counts_all/20210216181946_pages_domains.yml
+++ b/config/metrics/counts_all/20210216181946_pages_domains.yml
@@ -4,7 +4,7 @@ key_path: counts.pages_domains
 description: Total GitLab Pages domains
 product_section: ops
 product_stage: release
-product_group: group::release
+product_group: release
 product_category: pages
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
index 3c3fc600698..37128c7aa0a 100644
--- a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.verify.clusters_applications_runner
 description: Count of users creating managed clusters with Runner 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_all/20210216182002_remote_mirrors.yml b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
index 2730750ee5a..3f9b8ded5ce 100644
--- a/config/metrics/counts_all/20210216182002_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
@@ -4,7 +4,7 @@ key_path: counts.remote_mirrors
 description: Count of total remote mirrors. Includes both push 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_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index b2b19dfcf17..7755fec3a2c 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -4,7 +4,7 @@ key_path: counts.commit_comment
 description: Count of total unique commit comments. Does not include MR diff comments
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216182006_source_code_pushes.yml b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
index 9930105d8cf..5c3c70f2496 100644
--- a/config/metrics/counts_all/20210216182006_source_code_pushes.yml
+++ b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
@@ -4,7 +4,7 @@ key_path: counts.source_code_pushes
 description: Count of total Git push operations
 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_all/20210216182010_deploy_keys.yml b/config/metrics/counts_all/20210216182010_deploy_keys.yml
index cedafd4a576..347b487c999 100644
--- a/config/metrics/counts_all/20210216182010_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216182010_deploy_keys.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.create.deploy_keys
 description: Count of users creating deploy keys.
 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_all/20210216182012_keys.yml b/config/metrics/counts_all/20210216182012_keys.yml
index 72d7f5b2b7b..66d0c070b1c 100644
--- a/config/metrics/counts_all/20210216182012_keys.yml
+++ b/config/metrics/counts_all/20210216182012_keys.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.create.keys
 description: Count of users creating regular keys.
 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_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
index 37709066148..ca48d4f4251 100644
--- a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -5,7 +5,7 @@ description: Total count of projects that do not allow overriding approvers on d
   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_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
index 6613f87aafd..dbbb491e3f0 100644
--- a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -5,7 +5,7 @@ description: Count of total projects that do not disable overriding approvers pe
   discrete 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_all/20210216182017_remote_mirrors.yml b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
index 9930c937aee..df9dd1e03f9 100644
--- a/config/metrics/counts_all/20210216182017_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.create.remote_mirrors
 description: Count of users creating projects with remote 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_all/20210216182454_protected_branches_except_default.yml b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
index f1f1e877a83..1bc3b8ba43a 100644
--- a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
+++ b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
@@ -4,7 +4,7 @@ key_path: counts.protected_branches_except_default
 description: Count of branches that have been protected and are not the default branch
 product_section: dev
 product_stage: create
-product_group: group::source code
+product_group: source_code
 product_category: source_code_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
index a321b90faa5..90be5ffdc55 100644
--- a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_datadog_active
 description: Count of projects with active integrations for Datadog
 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_all/20210216182549_groups_datadog_active.yml b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
index 0647618b825..a3a52c46c32 100644
--- a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_datadog_active
 description: Count of groups with active integrations for Datadog
 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_all/20210216182551_templates_datadog_active.yml b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
index 975bc2164bc..9046087dbdc 100644
--- a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_datadog_active
 description: Count of active service templates for Datadog
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
index 0584c5c2c81..396e3f19253 100644
--- a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_datadog_active
 description: Count of active instance-level integrations for Datadog
 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_all/20210216182555_projects_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
index 1ef23e06c10..50b1f471188 100644
--- a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_datadog_active
 description: Count of active projects inheriting integrations for Datadog
 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_all/20210216182557_groups_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
index aed458187a8..039c71f6b32 100644
--- a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_datadog_active
 description: Count of active groups inheriting integrations for Datadog
 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_all/20210216182614_projects_ewm_active.yml b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
index 93d73cf233f..2a906265e76 100644
--- a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_ewm_active
 description: Count of projects with active integrations for EWM
 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_all/20210216182616_groups_ewm_active.yml b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
index 441f6e05077..f2de8af7f77 100644
--- a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_ewm_active
 description: Count of groups with active integrations for EWM
 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_all/20210216182618_templates_ewm_active.yml b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
index be61177d818..de408750880 100644
--- a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_ewm_active
 description: Count of active service templates for EWM
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
index cb3821cbb24..3cf2648b6ba 100644
--- a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_ewm_active
 description: Count of active instance-level integrations for EWM
 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_all/20210216182622_projects_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
index b5ac09a9313..5c7b7c23d20 100644
--- a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_ewm_active
 description: Count of active projects inheriting integrations for EWM
 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_all/20210216182623_groups_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
index 4cd950aeff5..c385ba3eccc 100644
--- a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_ewm_active
 description: Count of active groups inheriting integrations for EWM
 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_all/20210216182722_projects_mock_ci_active.yml b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
index 5c12fa79916..a3d554185c3 100644
--- a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_mock_ci_active
 description: Count of projects with active integrations for Mock CI
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
index eafff875bfb..0f00e04dbf9 100644
--- a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_mock_ci_active
 description: Count of groups with active integrations for Mock CI
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
index b421b3d1843..4cff208fc0e 100644
--- a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_mock_ci_active
 description: Count of active service templates for Mock CI
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
index eb7009db600..90878f664ca 100644
--- a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_mock_ci_active
 description: Count of active instance-level integrations for  Mock CI
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
index d2f5d4fe1e3..0e7cee64e47 100644
--- a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_mock_ci_active
 description: Count of active projects inheriting integrations for Mock CI
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
index 3727a16d08c..4bd419796cd 100644
--- a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_mock_ci_active
 description: Count of active groups inheriting integrations for Mock CI
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
index 59ffe96bc36..b44a007dd38 100644
--- a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_mock_monitoring_active
 description: Count of projects with active integrations for Mock Monitoring
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
index 2ac5362c37b..c7d70b6fb98 100644
--- a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_mock_monitoring_active
 description: Count of groups with active integrations for Mock Monitoring
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
index 961d787b203..7971b785633 100644
--- a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_mock_monitoring_active
 description: Count of active service templates for Mock Monitoring
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
index 9f2ece8e9a4..b5949125a90 100644
--- a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_mock_monitoring_active
 description: Count of active instance-level integrations for  Mock Monitoring
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
index 842d4047986..9cd2d8c098a 100644
--- a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_mock_monitoring_active
 description: Count of active projects inheriting integrations for Mock Monitoring
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
index bd8f344bb36..681ee727cd6 100644
--- a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_mock_monitoring_active
 description: Count of active groups inheriting integrations for Mock Monitoring
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml b/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
index 56909d1bb7b..4db8a831afc 100644
--- a/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
+++ b/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_composer_delete_package
 description: A count of Composer packages that have been deleted
 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_all/20210216182857_package_events_i_package_composer_pull_package.yml b/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
index 9dd401d73a9..cb1e984786c 100644
--- a/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
+++ b/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_composer_pull_package
 description: A count of Composer packages that have been downloaded
 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_all/20210216182859_package_events_i_package_composer_push_package.yml b/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
index 336d177a739..0296f58dfb0 100644
--- a/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
+++ b/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_composer_push_package
 description: A count of Composer packages that have been published
 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_all/20210216182901_package_events_i_package_conan_delete_package.yml b/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
index 548b005e9be..7617489c5f4 100644
--- a/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
+++ b/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_conan_delete_package
 description: A count of Conan packages that have been deleted
 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_all/20210216182903_package_events_i_package_conan_pull_package.yml b/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
index 65b5cd2a1a4..125ef341824 100644
--- a/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
+++ b/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_conan_pull_package
 description: A count of Conan packages that have been downloaded
 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_all/20210216182905_package_events_i_package_conan_push_package.yml b/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
index 8a8cc252b1e..3225658d982 100644
--- a/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
+++ b/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_conan_push_package
 description: A count of Conan packages that have been published
 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_all/20210216182907_package_events_i_package_container_delete_package.yml b/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
index c20a79a2f29..1a208c53f81 100644
--- a/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
+++ b/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_container_delete_package
 description: A count of container images that have been deleted
 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_all/20210216182909_package_events_i_package_container_pull_package.yml b/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
index ff3ab7b40cd..db4e4f63fff 100644
--- a/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
+++ b/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_container_pull_package
 description: A count of container images that have been downloaded
 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_all/20210216182911_package_events_i_package_container_push_package.yml b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
index 2c9d9a391a0..29b93b42dfb 100644
--- a/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
+++ b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_container_push_package
 description: A count of container images that have been published
 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_all/20210216182913_package_events_i_package_debian_delete_package.yml b/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
index e842155ca69..453f55a5e6a 100644
--- a/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
+++ b/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_debian_delete_package
 description: A count of Debian packages that have been deleted
 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_all/20210216182915_package_events_i_package_debian_pull_package.yml b/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
index be0e94f8beb..2949e819dff 100644
--- a/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
+++ b/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_debian_pull_package
 description: A count of Debian packages that have been downloaded
 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_all/20210216182917_package_events_i_package_debian_push_package.yml b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
index c6f23fe0c80..c71e5d608cf 100644
--- a/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
+++ b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_debian_push_package
 description: A count of Debian packages that have been published
 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_all/20210216182919_package_events_i_package_delete_package.yml b/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
index 988dc7118cb..eeb5198e028 100644
--- a/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
+++ b/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_delete_package
 description: A count of packages that have been deleted
 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_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml b/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
index 725df820fde..4d688af3908 100644
--- a/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_delete_package_by_deploy_token
 description: A count of packages that have been deleted using 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_all/20210216182923_package_events_i_package_delete_package_by_guest.yml b/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
index ea88cab3192..9978595cb0a 100644
--- a/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_delete_package_by_guest
 description: A count of packages that have been deleted using a Guest
 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_all/20210216182925_package_events_i_package_delete_package_by_user.yml b/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
index a87126920ce..1e348c18943 100644
--- a/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
+++ b/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_delete_package_by_user
 description: A count of packages that have been deleted using a logged in user
 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_all/20210216182927_package_events_i_package_generic_delete_package.yml b/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
index c8b2f9d61ef..b88a0fe1622 100644
--- a/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
+++ b/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_generic_delete_package
 description: A count of generic packages that have been deleted
 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_all/20210216182929_package_events_i_package_generic_pull_package.yml b/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
index af84d46955a..b2bcf1baffe 100644
--- a/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
+++ b/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_generic_pull_package
 description: A count of generic packages that have been downloaded
 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_all/20210216182931_package_events_i_package_generic_push_package.yml b/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
index 55d368c2f6b..54063d11b9f 100644
--- a/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
+++ b/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_generic_push_package
 description: A count of generic packages that have been published
 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_all/20210216182933_package_events_i_package_golang_delete_package.yml b/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
index 14d8fc53a7e..0ea0007c525 100644
--- a/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
+++ b/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_golang_delete_package
 description: A count of Go modules that have been deleted
 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_all/20210216182934_package_events_i_package_golang_pull_package.yml b/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
index 65e38c0eb8e..1b68386e3fe 100644
--- a/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
+++ b/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_golang_pull_package
 description: A count of Go modules that have been downloaded
 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_all/20210216182936_package_events_i_package_golang_push_package.yml b/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
index 3b65801378b..be3f7974a44 100644
--- a/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
+++ b/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_golang_push_package
 description: A count of Go modules that have been published
 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_all/20210216182938_package_events_i_package_maven_delete_package.yml b/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
index 7505efb4e47..676748442a5 100644
--- a/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
+++ b/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_maven_delete_package
 description: A count of Maven packages that have been deleted
 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_all/20210216182940_package_events_i_package_maven_pull_package.yml b/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
index dc5211f9524..f035edcc74c 100644
--- a/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
+++ b/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_maven_pull_package
 description: A count of Maven packages that have been downloaded
 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_all/20210216182942_package_events_i_package_maven_push_package.yml b/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
index 0facf7697a8..92521cc1fda 100644
--- a/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
+++ b/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_maven_push_package
 description: A count of Maven packages that have been published
 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_all/20210216182944_package_events_i_package_npm_delete_package.yml b/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
index dade0515709..24188860b45 100644
--- a/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
+++ b/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_npm_delete_package
 description: A count of npm packages that have been deleted
 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_all/20210216182946_package_events_i_package_npm_pull_package.yml b/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
index 607db7969cf..5dc94ab61fb 100644
--- a/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
+++ b/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_npm_pull_package
 description: A count of npm packages that have been downloaded
 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_all/20210216182948_package_events_i_package_npm_push_package.yml b/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
index 2aa9a9ac676..0878ec9ade8 100644
--- a/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
+++ b/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_npm_push_package
 description: A count of npm packages that have been published
 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_all/20210216182950_package_events_i_package_nuget_delete_package.yml b/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
index 78a5f920c0a..bd45f8fd652 100644
--- a/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
+++ b/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_nuget_delete_package
 description: A count of NuGet packages that have been deleted
 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_all/20210216182952_package_events_i_package_nuget_pull_package.yml b/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
index 29471d9fc68..e175f9ea64c 100644
--- a/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
+++ b/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_nuget_pull_package
 description: A count of NuGet packages that have been downloaded
 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_all/20210216182954_package_events_i_package_nuget_push_package.yml b/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
index 2074fa19d5a..5e3c4d13177 100644
--- a/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
+++ b/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_nuget_push_package
 description: A count of NuGet packages that have been published
 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_all/20210216182956_package_events_i_package_pull_package.yml b/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
index 0d09c626f2b..b059c11bf40 100644
--- a/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
+++ b/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_pull_package
 description: A count of packages that have been downloaded from the package 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_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml b/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
index eeb5c150f0f..532546fd7f3 100644
--- a/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
@@ -5,7 +5,7 @@ description: A count of packages that have been downloaded from the package regi
   using 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_all/20210216183000_package_events_i_package_pull_package_by_guest.yml b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
index 63ec075c163..d402d29612f 100644
--- a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
@@ -5,7 +5,7 @@ description: A count of packages that have been downloaded from the package regi
   by a guest
 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_all/20210216183002_package_events_i_package_pull_package_by_user.yml b/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
index ce0c3c455ff..21076556ce4 100644
--- a/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
+++ b/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
@@ -5,7 +5,7 @@ description: A count of packages that have been downloaded from the package regi
   by a user
 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_all/20210216183004_package_events_i_package_push_package.yml b/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
index 845251f1aca..c9f52de010b 100644
--- a/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
+++ b/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_push_package
 description: A count of packages that have been published to the package 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_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
index 4484250f136..cf0c42dce28 100644
--- a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
@@ -5,7 +5,7 @@ description: A count of packages that have been published to the package registr
   using 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_all/20210216183007_package_events_i_package_push_package_by_guest.yml b/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
index a657e2f228e..92d31d03faa 100644
--- a/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
@@ -5,7 +5,7 @@ description: A count of packages that have been published to the package registr
   by a Guest
 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_all/20210216183009_package_events_i_package_push_package_by_user.yml b/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
index a3e0a65453d..1a3b14e8a0b 100644
--- a/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
+++ b/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
@@ -5,7 +5,7 @@ description: A count of packages that have been published to the package registr
   by a user
 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_all/20210216183011_package_events_i_package_pypi_delete_package.yml b/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
index 2c5b6efe160..6c0e86090ae 100644
--- a/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
+++ b/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_pypi_delete_package
 description: A count of Python packages that have been deleted from the package 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_all/20210216183013_package_events_i_package_pypi_pull_package.yml b/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
index b659a207b00..2512818a4e1 100644
--- a/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
+++ b/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
@@ -5,7 +5,7 @@ description: A count of Python packages that have been downloaded from the packa
   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_all/20210216183015_package_events_i_package_pypi_push_package.yml b/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
index 33b0819be0b..4234dd52964 100644
--- a/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
+++ b/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_pypi_push_package
 description: A count of Python packages that have been published to the package 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_all/20210216183017_package_events_i_package_tag_delete_package.yml b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
index 7f5dab5e1bc..eef109e87c1 100644
--- a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
+++ b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_tag_delete_package
 description: A count of package tags that have been deleted from the package 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_all/20210216183019_package_events_i_package_tag_pull_package.yml b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
index 6cf631953f6..76923282a40 100644
--- a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
+++ b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_tag_pull_package
 description: A count of package tags that have been downloaded from the package 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_all/20210216183021_package_events_i_package_tag_push_package.yml b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
index dbd553d3ea1..823c81d37c4 100644
--- a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
+++ b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_tag_push_package
 description: A count of package tags that have been published to the package 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_all/20210216183023_wiki_pages_view.yml b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
index 16cec4839a5..059087a406d 100644
--- a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
+++ b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
@@ -4,7 +4,7 @@ key_path: counts.wiki_pages_view
 description: Total number of wiki page views
 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_all/20210216183400_omniauth_providers.yml b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
index a1cfca9019c..f4d6e2bc57b 100644
--- a/config/metrics/counts_all/20210216183400_omniauth_providers.yml
+++ b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.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_all/20210303153000_package_events_i_package_rubygems_delete_package.yml b/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
index 1ddfdd79f5c..15f3003f5d6 100644
--- a/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
+++ b/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_rubygems_delete_package
 description: Total count of RubyGems packages delete events
 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_all/20210303153002_package_events_i_package_rubygems_pull_package.yml b/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
index 7fd10456636..5c825c76296 100644
--- a/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
+++ b/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_rubygems_pull_package
 description: Total count of pull RubyGems packages events
 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_all/20210303153004_package_events_i_package_rubygems_push_package.yml b/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
index 73b2e4a5a25..f8a8fcf8abd 100644
--- a/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
+++ b/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_rubygems_push_package
 description: Total count of push RubyGems packages events
 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_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml b/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
index 91235499c14..df47faec027 100644
--- a/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
+++ b/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.projects_with_enabled_alert_integratio
 description: Histogram (buckets 1 to 100) of projects with at least 1 enabled integration.
 product_section: ops
 product_stage: monitor
-product_group: group::monitor
+product_group: monitor
 product_category: incident_management
 value_type: object
 status: active
diff --git a/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml b/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
index cca5b684905..b914a60050d 100644
--- a/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
+++ b/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_terraform_module_delete_package
 description: Total count of Terraform Module packages delete events
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: infrastructure_as_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml b/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
index 860bfbe6884..85258f27878 100644
--- a/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
+++ b/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_terraform_module_pull_package
 description: Total count of pull Terraform Module packages events
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: infrastructure_as_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml b/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
index 89fcae57044..f8d0643ab3a 100644
--- a/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
+++ b/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_terraform_module_push_package
 description: Total count of push Terraform Module packages events
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: infrastructure_as_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
index d0331a65b0b..e07dc348c67 100644
--- a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
+++ b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
@@ -5,7 +5,7 @@ name: "count_active_instance_ci_runners"
 description: Total active Shared (Instance) Runners
 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_all/20210502050341_ci_runners_group_type_active.yml b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
index b1a360df561..4b578cecb9d 100644
--- a/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
+++ b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
@@ -5,7 +5,7 @@ name: "count_active_group_ci_runners"
 description: Total active Group Runners
 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_all/20210502050834_ci_runners_project_type_active.yml b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
index b344f64c250..2e21fdc511e 100644
--- a/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
+++ b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
@@ -5,7 +5,7 @@ name: "count_active_project_ci_runners"
 description: Total active Specific (Project) Runners
 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_all/20210502050942_ci_runners_online.yml b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
index d24d7f0125b..455c3e39d4d 100644
--- a/config/metrics/counts_all/20210502050942_ci_runners_online.yml
+++ b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
@@ -5,7 +5,7 @@ name: "counts_online_runners"
 description: Total online Runners of all types
 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_all/20210502051651_ci_runners_instance_type_active_online.yml b/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
index 621590185a9..6a7f1f7c776 100644
--- a/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
+++ b/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
@@ -5,7 +5,7 @@ name: "count_instance_active_online_ci_runners"
 description: Total active and online Shared (Instance) Runners
 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_all/20210502051922_ci_runners_group_type_active_online.yml b/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
index 82c639c72c6..2c604235f36 100644
--- a/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
+++ b/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
@@ -5,7 +5,7 @@ name: "count_group_active_online_ci_runners"
 description: Total active and online Group Runners
 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_all/20210502052036_ci_runners_project_type_active_online.yml b/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
index f124d8d4ae5..aaedfeaf477 100644
--- a/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
+++ b/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
@@ -5,7 +5,7 @@ name: "count_project_active_online_ci_runners"
 description: Total active and online Specific (Project) Runners
 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_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml b/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
index a1a49a1a07e..185e8a199b6 100644
--- a/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
+++ b/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
@@ -4,7 +4,7 @@ key_path: counts.kubernetes_agent_k8s_api_proxy_request
 description: Count of Kubernetes API proxy requests
 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_all/20210510201537_in_product_marketing_email_create_0_sent.yml b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
index c201b4c79ee..1ce9be56198 100644
--- a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
+++ b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
@@ -5,7 +5,7 @@ name: "count_sent_first_email_of_the_create_track_for_in_product_marketing_email
 description: Total sent emails of the create track's first email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
index 92209dffa2d..98ed67d0910 100644
--- a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
@@ -5,7 +5,7 @@ name: "count_clicks_on_the_first_email_of_the_create_track_for_in_product_market
 description: Total clicks on the create track's first email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
index 2b849be1c32..67177bce5dd 100644
--- a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
+++ b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
@@ -5,7 +5,7 @@ name: "count_sent_second_email_of_the_create_track_for_in_product_marketing_emai
 description: Total sent emails of the create track's second email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
index a864858ae3a..c5c057fce25 100644
--- a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
@@ -5,7 +5,7 @@ name: "count_clicks_on_the_second_email_of_the_create_track_for_in_product_marke
 description: Total clicks on the create track's second email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
index 72a1d56cab2..c25864475c4 100644
--- a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
+++ b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
@@ -5,7 +5,7 @@ name: "count_sent_third_email_of_the_create_track_for_in_product_marketing_email
 description: Total sent emails of the create track's third email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
index 17dcf4286ac..37ec35d95ba 100644
--- a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
@@ -5,7 +5,7 @@ name: "count_clicks_on_the_third_email_of_the_create_track_for_in_product_market
 description: Total clicks on the create track's third email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
index c504783a652..59e3aff567d 100644
--- a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
+++ b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
@@ -5,7 +5,7 @@ name: "count_sent_first_email_of_the_verify_track_for_in_product_marketing_email
 description: Total sent emails of the verify track's first email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
index cb316eb3164..17ca0252a0c 100644
--- a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
@@ -5,7 +5,7 @@ name: "count_clicks_on_the_first_email_of_the_verify_track_for_in_product_market
 description: Total clicks on the verify track's first email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
index e4d1e90bb22..dfd8bb11919 100644
--- a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
+++ b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
@@ -5,7 +5,7 @@ name: "count_sent_second_email_of_the_verify_track_for_in_product_marketing_emai
 description: Total sent emails of the verify track's second email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
index 6675c6e9a0b..6c76386456a 100644
--- a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
@@ -5,7 +5,7 @@ name: "count_clicks_on_the_second_email_of_the_verify_track_for_in_product_marke
 description: Total clicks on the verify track's second email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
index 33c77609b6f..8cc755cc5bf 100644
--- a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
+++ b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
@@ -5,7 +5,7 @@ name: "count_sent_third_email_of_the_verify_track_for_in_product_marketing_email
 description: Total sent emails of the verify track's third email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
index 0cd780b53ed..61940a9e0cb 100644
--- a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
@@ -5,7 +5,7 @@ name: "count_clicks_on_the_third_email_of_the_verify_track_for_in_product_market
 description: Total clicks on the verify track's third email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
index 70c1e3d1250..cc2a9c29f1f 100644
--- a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
+++ b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
@@ -5,7 +5,7 @@ name: "count_sent_first_email_of_the_trial_track_for_in_product_marketing_emails
 description: Total sent emails of the trial track's first email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
index 258273438e3..3b4a1f7a88e 100644
--- a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
@@ -5,7 +5,7 @@ name: "count_clicks_on_the_first_email_of_the_trial_track_for_in_product_marketi
 description: Total clicks on the verify trial's first email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
index f32440ca1ae..dd7487b6609 100644
--- a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
+++ b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
@@ -5,7 +5,7 @@ name: "count_sent_second_email_of_the_trial_track_for_in_product_marketing_email
 description: Total sent emails of the trial track's second email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
index 0b68b88570c..0dd150778fe 100644
--- a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
@@ -5,7 +5,7 @@ name: "count_clicks_on_the_second_email_of_the_trial_track_for_in_product_market
 description: Total clicks on the trial track's second email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
index 185d5bb3aee..66610ba34f5 100644
--- a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
+++ b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
@@ -5,7 +5,7 @@ name: "count_sent_third_email_of_the_trial_track_for_in_product_marketing_emails
 description: Total sent emails of the trial track's third email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
index f3a54e2ae31..e630c81f53c 100644
--- a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
@@ -5,7 +5,7 @@ name: "count_clicks_on_the_third_email_of_the_trial_track_for_in_product_marketi
 description: Total clicks on the trial track's third email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
index 07b61f70b2e..b8febff5fcd 100644
--- a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
+++ b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
@@ -5,7 +5,7 @@ name: "count_sent_first_email_of_the_trial_team_for_in_product_marketing_emails"
 description: Total sent emails of the team track's first email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
index 27d47aff9c3..d90a0f9dbde 100644
--- a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
@@ -5,7 +5,7 @@ name: "count_clicks_on_the_first_email_of_the_team_track_for_in_product_marketin
 description: Total clicks on the team track's first email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
index daba149d6c5..84f7d7d28af 100644
--- a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
+++ b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
@@ -5,7 +5,7 @@ name: "count_sent_second_email_of_the_team_track_for_in_product_marketing_emails
 description: Total sent emails of the team track's second email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
index 7bb67a87c75..1abe86f5a89 100644
--- a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
@@ -5,7 +5,7 @@ name: "count_clicks_on_the_second_email_of_the_team_track_for_in_product_marketi
 description: Total clicks on the team track's second email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
index aaaecb85e74..ba1530445e8 100644
--- a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
+++ b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
@@ -5,7 +5,7 @@ name: "count_sent_third_email_of_the_team_track_for_in_product_marketing_emails"
 description: Total sent emails of the team track's third email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
index 0618ca56e89..f9b473aec6c 100644
--- a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
@@ -5,7 +5,7 @@ name: "count_clicks_on_the_third_email_of_the_team_track_for_in_product_marketin
 description: Total clicks on the team track's third email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210514141520_project_imports_total.yml b/config/metrics/counts_all/20210514141520_project_imports_total.yml
index 14eac482774..cfd3581c337 100644
--- a/config/metrics/counts_all/20210514141520_project_imports_total.yml
+++ b/config/metrics/counts_all/20210514141520_project_imports_total.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.project_imports.total
 description: Number 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_all/20210517073546_package_events_i_package_helm_pull_package.yml b/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
index 111056238bd..04cc4a17b45 100644
--- a/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
+++ b/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_helm_pull_package
 description: Total count of pull Helm packages events
 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_all/20210518081225_in_product_marketing_email_experience_0_sent.yml b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
index d4b2f57f3a4..720b0dde650 100644
--- a/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
+++ b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
@@ -5,12 +5,14 @@ name: "count_sent_first_email_of_the_experience_track_for_in_product_marketing_e
 description: Total sent emails of the experience track's first email
 product_section: 'TBD'
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
-status: active
+status: removed
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61347
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92280
+milestone_removed: "15.2"
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml b/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml
index 3752f3c8b2f..c529f1ecb8a 100644
--- a/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml
+++ b/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml
@@ -3,7 +3,7 @@ key_path: counts.package_events_i_package_helm_push_package
 description: The total count of Helm packages that have been published.
 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_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml b/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
index 8515a522a60..164cdd477cb 100644
--- a/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
+++ b/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
@@ -4,7 +4,7 @@ name: nuget_symbol_packages_pulled
 description: A count of NuGet symbol packages that have been downloaded from the package 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_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml b/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml
index 819c53bcc4f..eb9576c864c 100644
--- a/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml
+++ b/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml
@@ -4,7 +4,7 @@ name: nuget_symbol_packages_pushed
 description: A count of NuGet symbol packages that have been uploaded to the package 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_all/20210709210941_package_events_i_package_pull_symbol_package.yml b/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
index 7d390649020..712eeb644cc 100644
--- a/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
+++ b/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
@@ -4,7 +4,7 @@ name: symbol_packages_pulled
 description: A count of symbol packages that have been pulled from the package 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_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml b/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
index f3e48ba6786..d4ebb18d006 100644
--- a/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
@@ -4,7 +4,7 @@ name: symbol_packages_pulled_by_deploy_token
 description: A count of symbol packages that have been pulled with a deploy token from the package 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_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml b/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
index c80ddea659f..d84a218e88e 100644
--- a/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
+++ b/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
@@ -4,7 +4,7 @@ name: symbol_packages_pulled_by_guest
 description: A count of symbol packages that have been pulled with by a guest from the package 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_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml b/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
index 8959af7f70c..b91dfa334a5 100644
--- a/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
+++ b/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
@@ -4,7 +4,7 @@ name: symbol_packages_pulled_by_user
 description: A count of symbol packages that have been pulled with by an authenticated user from the package 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_all/20210709211439_package_events_i_package_push_symbol_package.yml b/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
index 35d89b856f3..a6335011ddd 100644
--- a/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
+++ b/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
@@ -4,7 +4,7 @@ name: symbol_packages_pushed
 description: A count of symbol packages that have been pushed to the package 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_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml b/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
index f102da96d17..acc00f50744 100644
--- a/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
@@ -4,7 +4,7 @@ name: symbol_packages_pushed_by_deploy_token
 description: A count of symbol packages that have been pushed with a deploy token to the package 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_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml b/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
index 7e5e63b6a17..16635a5f6a9 100644
--- a/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
+++ b/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
@@ -4,7 +4,7 @@ name: symbol_packages_pushed_by_guest
 description: A count of symbol packages that have been pushed by a guest to the package 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_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml b/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
index e45db0aee02..653814c4bf0 100644
--- a/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
+++ b/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
@@ -4,7 +4,7 @@ name: symbol_packages_pushed_by_user
 description: A count of symbol packages that have been pushed by an authenticated user to the package 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_all/20210715094459_releases_with_milestones.yml b/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
index 0be5497e561..a935f1e5829 100644
--- a/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
+++ b/config/metrics/counts_all/20210715094459_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_all/20210723075525_diff_searches.yml b/config/metrics/counts_all/20210723075525_diff_searches.yml
index 28e1ce927dc..0cce12a8659 100644
--- a/config/metrics/counts_all/20210723075525_diff_searches.yml
+++ b/config/metrics/counts_all/20210723075525_diff_searches.yml
@@ -3,7 +3,7 @@ key_path: counts.diff_searches
 description: Total count of merge request diff searches
 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_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml b/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
index 0f0b467ab45..94b3340d1ca 100644
--- a/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
@@ -4,7 +4,7 @@ name: "count_clicks_on_the_first_email_of_the_team_short_track_for_in_product_ma
 description: Total clicks on the team_short track's first email
 product_section: growth
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml b/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
index e60be585be8..dbcd4faf26f 100644
--- a/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
+++ b/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
@@ -4,7 +4,7 @@ name: "count_sent_first_email_of_the_team_short_track_for_in_product_marketing_e
 description: Total sent emails of the team_short track's first email
 product_section: growth
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml b/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
index a34cc75c09b..a23c977240a 100644
--- a/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
@@ -4,7 +4,7 @@ name: "count_clicks_on_the_first_email_of_the_trial_short_track_for_in_product_m
 description: Total clicks on the trial_short track's first email
 product_section: growth
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml b/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
index 05711afef8f..c24e2f4b6b5 100644
--- a/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
+++ b/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
@@ -4,7 +4,7 @@ name: "count_sent_first_email_of_the_trial_short_track_for_in_product_marketing_
 description: Total sent emails of the trial_short track's first email
 product_section: growth
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
index 695fada6670..2a62f9a572f 100644
--- a/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
@@ -4,7 +4,7 @@ name: "count_clicks_on_the_first_email_of_the_admin_verify_track_for_in_product_
 description: Total clicks on the admin_verify track's first email
 product_section: growth
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml b/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
index 8f52a79cc2a..b04c9502a12 100644
--- a/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
+++ b/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
@@ -4,7 +4,7 @@ name: "count_sent_first_email_of_the_admin_verify_track_for_in_product_marketing
 description: Total sent emails of the admin_verify track's first email
 product_section: growth
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210730011801_projects_zentao_active.yml b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
index 8a9c3f969a0..857e96901a1 100644
--- a/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
@@ -4,7 +4,7 @@ name: count_all_projects_zentao_active
 description: Count of projects with active Zentao integrations
 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_all/20210730011802_groups_zentao_active.yml b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
index c8a1dfbbdd2..d0b023c241e 100644
--- a/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
@@ -4,7 +4,7 @@ name: count_all_groups_zentao_active
 description: Count of groups with active Zentao integrations
 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_all/20210730011804_instances_zentao_active.yml b/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
index b1c2a9d8b13..89532a91d52 100644
--- a/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
@@ -4,7 +4,7 @@ name: count_all_instances_zentao_active
 description: Count of instances with active Zentao integrations
 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_all/20210730011805_projects_inheriting_zentao_active.yml b/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
index 34c48ada0ee..054714f5c42 100644
--- a/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
@@ -4,7 +4,7 @@ name: count_all_projects_inheriting_zentao_active
 description: Count of projects that inherit active Zentao integrations
 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_all/20210730011806_groups_inheriting_zentao_active.yml b/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
index 4d374db026e..ce6797e5114 100644
--- a/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
@@ -4,7 +4,7 @@ name: count_all_groups_inheriting_zentao_active
 description: Count of groups that inherit active Zentao integrations
 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_all/20210910132001_user_auth_by_provider.yml b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
index bb79aa07e86..98ac9ace52f 100644
--- a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
+++ b/config/metrics/counts_all/20210910132001_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_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml b/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml
index 1a9fe349a90..276b1c97e0c 100644
--- a/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml
+++ b/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml
@@ -5,7 +5,7 @@ description: A count of projects with the cleanup policy set delete tags older t
   60 days
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
index 43b71ec1c8a..5c3fc71f564 100644
--- a/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
@@ -4,7 +4,7 @@ name: count_groups_gitlab_slack_application_active
 description: Count groups with active slack application
 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_all/20210916101641_projects_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml
index 13954e6d01b..a3fac680dbf 100644
--- a/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml
@@ -4,7 +4,7 @@ name: count_project_gitlab_slack_application_active
 description: Count projects with active slack application
 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_all/20210916101837_instances_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml
index 43ea3d2d6e6..a4908a2a8e1 100644
--- a/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml
@@ -4,7 +4,7 @@ name: count_instances_gitlab_slack_application_active
 description: Count instances with active slack application
 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_all/20210916200930_clusters_integrations_prometheus.yml b/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
index 2e17c5d261b..fd4a833b2b3 100644
--- a/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
+++ b/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_integrations_prometheus
 description: Total clusters with Clusters::Integrations::Prometheus 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_all/20210916200931_clusters_integrations_elastic_stack.yml b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
index 54437cfbf36..72183cdf8ac 100644
--- a/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
+++ b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
@@ -4,10 +4,10 @@ key_path: counts.clusters_integrations_elastic_stack
 description: Total clusters with Clusters::Integrations::ElasticStack enabled
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: kubernetes_management
 value_type: number
-status: active
+status: removed
 time_frame: all
 data_source: database
 distribution:
@@ -19,3 +19,5 @@ tier:
 - ultimate
 performance_indicator_type: []
 milestone: "14.4"
+milestone_removed: "15.2"
+removed_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90699"
diff --git a/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml b/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml
index d0baa4d0751..47928eee9cb 100644
--- a/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml
+++ b/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.clusters_integrations_prometheus
 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_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml
index 70dc230ac85..f5d10688fec 100644
--- a/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml
@@ -4,7 +4,7 @@ name: count_groups_inheriting_gitlab_slack_application_active
 description: Count groups inheriting active slack application
 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_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
index 29781313d61..17bb5b34247 100644
--- a/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
@@ -4,7 +4,7 @@ name: count_project_inheriting_gitlab_slack_application_active
 description: Count projects inheriting active slack application
 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_all/20211028210001_projects_shimo_active.yml b/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
index b6b11407c6a..3d7f04a9f82 100644
--- a/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
@@ -4,7 +4,7 @@ name: count_all_projects_shimo_active
 description: Count of projects with active Shimo integrations
 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_all/20211028210002_groups_shimo_active.yml b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
index 3f2423f7696..641d40aa1fd 100644
--- a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
@@ -4,7 +4,7 @@ name: count_all_groups_shimo_active
 description: Count of groups with active Shimo integrations
 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_all/20211028210003_instances_shimo_active.yml b/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
index 2b835ef6d6c..e9b77835ca4 100644
--- a/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
@@ -4,7 +4,7 @@ name: count_all_instances_shimo_active
 description: Count of instances with active Shimo integrations
 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_all/20211028210004_projects_inheriting_shimo_active.yml b/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
index d7d231206d5..7693de6b2f2 100644
--- a/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
@@ -4,7 +4,7 @@ name: count_all_projects_inheriting_shimo_active
 description: Count of projects that inherit active Shimo integrations
 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_all/20211028210005_groups_inheriting_shimo_active.yml b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
index d979e672f60..b81747fee78 100644
--- a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
@@ -4,7 +4,7 @@ name: count_all_groups_inheriting_shimo_active
 description: Count of groups that inherit active Shimo integrations
 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_all/20220122022215_web_ide_previews_success.yml b/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml
index 4042e892a61..203201e9174 100644
--- a/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml
+++ b/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml
@@ -4,7 +4,7 @@ key_path: counts.web_ide_previews_success
 description: Count of Live Preview tab successful initializations in 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_all/20220314362302_service_usage_data_download_payload.yml b/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml
index 0174f9a6222..1b26202c5ef 100644
--- a/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml
+++ b/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml
@@ -2,10 +2,10 @@
 key_path: counts.service_usage_data_download_payload_click
 description: Count Download Payload button clicks
 data_category: optional
-name: count_promoted_issues
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
+name: service_usage_data_download_payload_click
+product_section: analytics
+product_stage: analytics
+product_group: product_intelligence
 product_category: collection
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220315180122_projects_harbor_active.yml b/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
index 90bdad02b8b..ff28b7df17f 100644
--- a/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_harbor_active
 description: Count of projects with active integrations for Harbor
 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_all/20220315180124_groups_harbor_active.yml b/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
index 6fc8d9a8ec2..79614c925d1 100644
--- a/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_harbor_active
 description: Count of groups with active integrations for Harbor
 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_all/20220315180127_instances_harbor_active.yml b/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
index a5621da5390..b865a905c0b 100644
--- a/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_harbor_active
 description: Count of active instance-level integrations for Harbor
 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_all/20220315180129_projects_inheriting_harbor_active.yml b/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
index 97c31b331aa..375f3b9a0b3 100644
--- a/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_harbor_active
 description: Count of active projects inheriting integrations for Harbor
 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_all/20220315180131_groups_inheriting_harbor_active.yml b/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
index 7091a87632f..6e216121414 100644
--- a/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_harbor_active
 description: Count of active groups inheriting integrations for Harbor
 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/license/20210201124932_recorded_at.yml b/config/metrics/license/20210201124932_recorded_at.yml
index 59388f5bb20..c9d98a96727 100644
--- a/config/metrics/license/20210201124932_recorded_at.yml
+++ b/config/metrics/license/20210201124932_recorded_at.yml
@@ -2,9 +2,9 @@
 data_category: standard
 key_path: recorded_at
 description: When the Usage Ping computation was started
-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: string
 status: active
diff --git a/config/metrics/license/20210201124933_uuid.yml b/config/metrics/license/20210201124933_uuid.yml
index 11cb6ac1411..f864c2be37a 100644
--- a/config/metrics/license/20210201124933_uuid.yml
+++ b/config/metrics/license/20210201124933_uuid.yml
@@ -1,9 +1,9 @@
 ---
 key_path: uuid
 description: GitLab instance unique identifier
-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: string
 status: active
diff --git a/config/metrics/license/20210204124827_hostname.yml b/config/metrics/license/20210204124827_hostname.yml
index 4496f158ea1..f545ae0c061 100644
--- a/config/metrics/license/20210204124827_hostname.yml
+++ b/config/metrics/license/20210204124827_hostname.yml
@@ -1,9 +1,9 @@
 ---
 key_path: hostname
 description: Host name of GitLab instance
-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: string
 status: active
diff --git a/config/metrics/license/20210204124829_active_user_count.yml b/config/metrics/license/20210204124829_active_user_count.yml
index e4347ebef9d..037ac7b5a03 100644
--- a/config/metrics/license/20210204124829_active_user_count.yml
+++ b/config/metrics/license/20210204124829_active_user_count.yml
@@ -1,9 +1,9 @@
 ---
 key_path: active_user_count
 description: The number of active users existing in the instance. This is named the instance_user_count in the Versions application.
-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: active
diff --git a/config/metrics/license/20210204124928_version.yml b/config/metrics/license/20210204124928_version.yml
index de081d10cff..77cfcc38204 100644
--- a/config/metrics/license/20210204124928_version.yml
+++ b/config/metrics/license/20210204124928_version.yml
@@ -4,7 +4,7 @@ key_path: gitaly.version
 description: Version of Gitaly
 product_section: dev
 product_stage: create
-product_group: group::gitaly
+product_group: gitaly
 product_category: gitaly
 value_type: string
 status: active
diff --git a/config/metrics/license/20210204124936_pages_version.yml b/config/metrics/license/20210204124936_pages_version.yml
index 878134574e2..c056ca97ed0 100644
--- a/config/metrics/license/20210204124936_pages_version.yml
+++ b/config/metrics/license/20210204124936_pages_version.yml
@@ -4,7 +4,7 @@ key_path: gitlab_pages.version
 description: The version number of GitLab Pages
 product_section: ops
 product_stage: release
-product_group: group::release
+product_group: release
 product_category: pages
 value_type: string
 status: active
diff --git a/config/metrics/license/20210204124938_recording_ce_finished_at.yml b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
index 02521e8bd2c..54728ff8206 100644
--- a/config/metrics/license/20210204124938_recording_ce_finished_at.yml
+++ b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
@@ -2,9 +2,9 @@
 data_category: standard
 key_path: recording_ce_finished_at
 description: When the core features were computed
-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: string
 status: active
diff --git a/config/metrics/license/20210216175601_version.yml b/config/metrics/license/20210216175601_version.yml
index a6af4ff2c9b..3eb94445513 100644
--- a/config/metrics/license/20210216175601_version.yml
+++ b/config/metrics/license/20210216175601_version.yml
@@ -4,7 +4,7 @@ key_path: version
 description: Version of GitLab instance
 product_section: enablement
 product_stage: enablement
-product_group: group::distribution
+product_group: distribution
 product_category: collection
 value_type: string
 status: active
diff --git a/config/metrics/license/20210216175602_installation_type.yml b/config/metrics/license/20210216175602_installation_type.yml
index d19405549d6..9c3abd0131f 100644
--- a/config/metrics/license/20210216175602_installation_type.yml
+++ b/config/metrics/license/20210216175602_installation_type.yml
@@ -4,7 +4,7 @@ key_path: installation_type
 description: The installation method used to install GitLab (Omnibus, Helm, etc)
 product_section: enablement
 product_stage: enablement
-product_group: group::distribution
+product_group: distribution
 product_category: collection
 value_type: string
 status: active
diff --git a/config/metrics/license/20210216181053_version.yml b/config/metrics/license/20210216181053_version.yml
index d6e6ea1c0e0..36920d7c895 100644
--- a/config/metrics/license/20210216181053_version.yml
+++ b/config/metrics/license/20210216181053_version.yml
@@ -4,7 +4,7 @@ key_path: container_registry_server.version
 description: Identifies the version of the external registry being used
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: number
 status: active
diff --git a/config/metrics/license/20210216183237_version.yml b/config/metrics/license/20210216183237_version.yml
index 8d00f03f52b..3303d8fbdef 100644
--- a/config/metrics/license/20210216183237_version.yml
+++ b/config/metrics/license/20210216183237_version.yml
@@ -4,7 +4,7 @@ key_path: git.version
 description: Information about Git version
 product_section: enablement
 product_stage: enablement
-product_group: group::distribution
+product_group: distribution
 product_category: ''
 value_type: object
 value_json_schema: 'config/metrics/objects_schemas/git_version_schema.json'
diff --git a/config/metrics/schema.json b/config/metrics/schema.json
index bb024eac8c1..8991385b714 100644
--- a/config/metrics/schema.json
+++ b/config/metrics/schema.json
@@ -19,7 +19,8 @@
       "type": ["string"]
     },
     "product_group": {
-      "type": "string"
+      "type": "string",
+      "pattern": "^$|^([a-z]+_)*[a-z]+$"
     },
     "product_category": {
       "type": ["string", "null"]
diff --git a/config/metrics/settings/20210201124935_database_adapter.yml b/config/metrics/settings/20210201124935_database_adapter.yml
index a127b2b70dd..335f8eb15ac 100644
--- a/config/metrics/settings/20210201124935_database_adapter.yml
+++ b/config/metrics/settings/20210201124935_database_adapter.yml
@@ -6,7 +6,7 @@ description: This metric only returns a value of PostgreSQL in supported version
   supported.
 product_section: enablement
 product_stage: enablement
-product_group: group::enablement distribution
+product_group: enablement_distribution
 product_category: collection
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
index f0bcf95871a..a5406c43c4b 100644
--- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
@@ -4,7 +4,7 @@ key_path: instance_auto_devops_enabled
 description: Whether auto DevOps is enabled
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category: auto_devops
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index 1fdee829b84..de5f181216b 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -4,7 +4,7 @@ key_path: container_registry_enabled
 description: A count of projects where the container registry is enabled
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
index 694bb4b08bd..3ed4fa06c05 100644
--- a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -4,7 +4,7 @@ key_path: dependency_proxy_enabled
 description: A count of projects where the dependency proxy is enabled
 product_section: ops
 product_stage: package
-product_group: group::package
+product_group: package
 product_category: container registry
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
index c58b3a8c8d5..8c92609ca26 100644
--- a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -4,7 +4,7 @@ key_path: gitlab_shared_runners_enabled
 description: Whether shared runners is enabled
 product_section: ops
 product_stage: verify
-product_group: group::runner
+product_group: runner
 product_category: runner
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index a6997b74c3c..ec7495cfbe5 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -4,7 +4,7 @@ key_path: gravatar_enabled
 description: Whether gravatar is enabled
 product_section: dev
 product_stage: manage
-product_group: group::authentication and authorization
+product_group: authentication_and_authorization
 product_category: users
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
index 8f44f0c9de5..2c506cb40fc 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -4,7 +4,7 @@ key_path: ldap_enabled
 description: Whether LDAP is enabled
 product_section: dev
 product_stage: manage
-product_group: group::authentication and authorization
+product_group: authentication_and_authorization
 product_category: authentication_and_authorization
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
index cc00b3b9da2..c269fe6edd4 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -4,7 +4,7 @@ key_path: mattermost_enabled
 description: Whether Mattermost is enabled
 product_section: dev
 product_stage: ecosystem
-product_group: group::integrations
+product_group: integrations
 product_category: integrations
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
index 8932b275f38..83ea666a331 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -4,7 +4,7 @@ key_path: omniauth_enabled
 description: Whether OmniAuth is enabled
 product_section: dev
 product_stage: manage
-product_group: group::authentication and authorization
+product_group: authentication_and_authorization
 product_category: authentication_and_authorization
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210204124912_prometheus_enabled.yml b/config/metrics/settings/20210204124912_prometheus_enabled.yml
index e19d5ff781a..dbbd2b74970 100644
--- a/config/metrics/settings/20210204124912_prometheus_enabled.yml
+++ b/config/metrics/settings/20210204124912_prometheus_enabled.yml
@@ -2,10 +2,9 @@
 data_category: operational
 key_path: prometheus_enabled
 description: Whether the bundled Prometheus is enabled
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+product_section: ops
+product_stage: monitor
+product_group: respond
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
index 5b1447a58e8..197ea408f73 100644
--- a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
+++ b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
@@ -2,10 +2,9 @@
 data_category: operational
 key_path: prometheus_metrics_enabled
 description: Whether Prometheus Metrics endpoint is enabled
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+product_section: ops
+product_stage: monitor
+product_group: respond
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
index c9d223c8c58..b003b2d8c19 100644
--- a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -4,7 +4,7 @@ key_path: reply_by_email_enabled
 description: Whether incoming email is setup
 product_section: dev
 product_stage: plan
-product_group: group::certify
+product_group: certify
 product_category: collection
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
index 4fa464fa5c7..df7f03a7d2e 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -4,7 +4,7 @@ key_path: signup_enabled
 description: Whether public signup is enabled
 product_section: dev
 product_stage: manage
-product_group: group::authentication and authorization
+product_group: authentication_and_authorization
 product_category: authentication_and_authorization
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
index 9bc2a90fc1d..ba19088442f 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -4,7 +4,7 @@ key_path: web_ide_clientside_preview_enabled
 description: Whether Web IDE clientside preview is enabled
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: collection
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210204124922_grafana_link_enabled.yml b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
index d636f00312d..104f991e96f 100644
--- a/config/metrics/settings/20210204124922_grafana_link_enabled.yml
+++ b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: grafana_link_enabled
 description: Whether Grafana is enabled
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
+product_section: ops
+product_stage: monitor
+product_group: respond
 product_category: collection
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210204124934_pages_enabled.yml b/config/metrics/settings/20210204124934_pages_enabled.yml
index e267bd7109b..1535932b559 100644
--- a/config/metrics/settings/20210204124934_pages_enabled.yml
+++ b/config/metrics/settings/20210204124934_pages_enabled.yml
@@ -4,7 +4,7 @@ key_path: gitlab_pages.enabled
 description: Whether GitLab Pages is enabled
 product_section: ops
 product_stage: release
-product_group: group::release
+product_group: release
 product_category: collection
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216174829_smtp_server.yml b/config/metrics/settings/20210216174829_smtp_server.yml
index c1e4d77bc6c..8d126e75ac0 100644
--- a/config/metrics/settings/20210216174829_smtp_server.yml
+++ b/config/metrics/settings/20210216174829_smtp_server.yml
@@ -4,7 +4,7 @@ key_path: mail.smtp_server
 description: The value of the SMTP server that is used
 product_section: growth
 product_stage: growth
-product_group: group::activation
+product_group: activation
 product_category: onboarding
 value_type: number
 status: active
diff --git a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
index 9bf0277363f..afd8478ae1c 100644
--- a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -4,7 +4,7 @@ key_path: ingress_modsecurity_enabled
 description: Whether or not ModSecurity is enabled within Ingress
 product_section: sec
 product_stage: protect
-product_group: group::container security
+product_group: container_security
 product_category: web_firewall
 value_type: boolean
 status: removed
diff --git a/config/metrics/settings/20210216175604_edition.yml b/config/metrics/settings/20210216175604_edition.yml
index 9a586f0c78b..a8d363796ed 100644
--- a/config/metrics/settings/20210216175604_edition.yml
+++ b/config/metrics/settings/20210216175604_edition.yml
@@ -4,7 +4,7 @@ key_path: edition
 description: Edition of GitLab such as EE or CE
 product_section: enablement
 product_stage: enablement
-product_group: group::distribution
+product_group: distribution
 product_category: collection
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
index 046811b8686..b1eee864e24 100644
--- a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
@@ -4,7 +4,7 @@ key_path: settings.ldap_encrypted_secrets_enabled
 description: Is encrypted LDAP secrets configured?
 product_section: enablement
 product_stage: enablement
-product_group: group::distribution
+product_group: distribution
 product_category: global_search
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216175609_version.yml b/config/metrics/settings/20210216175609_version.yml
index 136b8fed4ff..24637178a2a 100644
--- a/config/metrics/settings/20210216175609_version.yml
+++ b/config/metrics/settings/20210216175609_version.yml
@@ -4,7 +4,7 @@ key_path: database.version
 description: The version of the PostgreSQL database.
 product_section: enablement
 product_stage: enablement
-product_group: group::distribution
+product_group: distribution
 product_category: collection
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216180314_gitpod_enabled.yml b/config/metrics/settings/20210216180314_gitpod_enabled.yml
index 15a747fdffb..73ba2dd01fd 100644
--- a/config/metrics/settings/20210216180314_gitpod_enabled.yml
+++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml
@@ -4,7 +4,7 @@ key_path: gitpod_enabled
 description: Whether Gitpod is enabled in the instance
 product_section: dev
 product_stage: create
-product_group: group::editor
+product_group: editor
 product_category: integrations
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180836_enabled.yml b/config/metrics/settings/20210216180836_enabled.yml
index 12eae478add..a52473734eb 100644
--- a/config/metrics/settings/20210216180836_enabled.yml
+++ b/config/metrics/settings/20210216180836_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.artifacts.enabled
 description: Whether Object Storage is enabled for Artifacts
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180838_enabled.yml b/config/metrics/settings/20210216180838_enabled.yml
index da6dd5fce62..68a466ebf0a 100644
--- a/config/metrics/settings/20210216180838_enabled.yml
+++ b/config/metrics/settings/20210216180838_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.artifacts.object_store.enabled
 description: Whether Object Storage is enabled for Artifacts
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180840_direct_upload.yml b/config/metrics/settings/20210216180840_direct_upload.yml
index 279b9472364..242add8c15b 100644
--- a/config/metrics/settings/20210216180840_direct_upload.yml
+++ b/config/metrics/settings/20210216180840_direct_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.artifacts.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for Artifacts
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180841_background_upload.yml b/config/metrics/settings/20210216180841_background_upload.yml
index 829e20e2405..e9d9d475b06 100644
--- a/config/metrics/settings/20210216180841_background_upload.yml
+++ b/config/metrics/settings/20210216180841_background_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.artifacts.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for Artifacts
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180843_provider.yml b/config/metrics/settings/20210216180843_provider.yml
index 848e0669b73..bdb58fff347 100644
--- a/config/metrics/settings/20210216180843_provider.yml
+++ b/config/metrics/settings/20210216180843_provider.yml
@@ -4,7 +4,7 @@ key_path: object_store.artifacts.object_store.provider
 description: What Object Storage provider has been configured for Artifacts
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216180845_enabled.yml b/config/metrics/settings/20210216180845_enabled.yml
index d5e42959871..f712d4fd306 100644
--- a/config/metrics/settings/20210216180845_enabled.yml
+++ b/config/metrics/settings/20210216180845_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.external_diffs.enabled
 description: Whether Object Storage is enabled for External Diffs
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180847_enabled.yml b/config/metrics/settings/20210216180847_enabled.yml
index 49c8c887ccc..128418f4bd3 100644
--- a/config/metrics/settings/20210216180847_enabled.yml
+++ b/config/metrics/settings/20210216180847_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.external_diffs.object_store.enabled
 description: Whether Object Storage is enabled for External Diffs
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180849_direct_upload.yml b/config/metrics/settings/20210216180849_direct_upload.yml
index d91e033ee4a..e1865f244e9 100644
--- a/config/metrics/settings/20210216180849_direct_upload.yml
+++ b/config/metrics/settings/20210216180849_direct_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.external_diffs.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for External Diffs
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180851_background_upload.yml b/config/metrics/settings/20210216180851_background_upload.yml
index 76dc5007857..b7a0d328b8b 100644
--- a/config/metrics/settings/20210216180851_background_upload.yml
+++ b/config/metrics/settings/20210216180851_background_upload.yml
@@ -5,7 +5,7 @@ description: Whether Background Upload for Object Storage is enabled for Externa
   Diffs
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180852_provider.yml b/config/metrics/settings/20210216180852_provider.yml
index 01cd2a43ff2..c6d09c82480 100644
--- a/config/metrics/settings/20210216180852_provider.yml
+++ b/config/metrics/settings/20210216180852_provider.yml
@@ -4,7 +4,7 @@ key_path: object_store.external_diffs.object_store.provider
 description: What Object Storage provider has been configured for External Diffs
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216180854_enabled.yml b/config/metrics/settings/20210216180854_enabled.yml
index bf0ec99486b..a4fca5e347b 100644
--- a/config/metrics/settings/20210216180854_enabled.yml
+++ b/config/metrics/settings/20210216180854_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.lfs.enabled
 description: Whether Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180856_enabled.yml b/config/metrics/settings/20210216180856_enabled.yml
index a21b8f0eb15..05c390c0040 100644
--- a/config/metrics/settings/20210216180856_enabled.yml
+++ b/config/metrics/settings/20210216180856_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.lfs.object_store.enabled
 description: Whether Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180858_direct_upload.yml b/config/metrics/settings/20210216180858_direct_upload.yml
index 85619adc8f2..8cdfd1844b8 100644
--- a/config/metrics/settings/20210216180858_direct_upload.yml
+++ b/config/metrics/settings/20210216180858_direct_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.lfs.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180900_background_upload.yml b/config/metrics/settings/20210216180900_background_upload.yml
index 959ae65306d..ed6931dd443 100644
--- a/config/metrics/settings/20210216180900_background_upload.yml
+++ b/config/metrics/settings/20210216180900_background_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.lfs.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180902_provider.yml b/config/metrics/settings/20210216180902_provider.yml
index 50b88f893ee..40a39acc8fd 100644
--- a/config/metrics/settings/20210216180902_provider.yml
+++ b/config/metrics/settings/20210216180902_provider.yml
@@ -4,7 +4,7 @@ key_path: object_store.lfs.object_store.provider
 description: What Object Storage provider has been configured for LFS
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216180903_enabled.yml b/config/metrics/settings/20210216180903_enabled.yml
index 759fdeeba93..3e3f1ec17dc 100644
--- a/config/metrics/settings/20210216180903_enabled.yml
+++ b/config/metrics/settings/20210216180903_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.uploads.enabled
 description: Whether Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216180905_enabled.yml b/config/metrics/settings/20210216180905_enabled.yml
index b71472488b1..7e35d718dd3 100644
--- a/config/metrics/settings/20210216180905_enabled.yml
+++ b/config/metrics/settings/20210216180905_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.uploads.object_store.enabled
 description: Whether Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180907_direct_upload.yml b/config/metrics/settings/20210216180907_direct_upload.yml
index b5e702462ec..53f3e2a7022 100644
--- a/config/metrics/settings/20210216180907_direct_upload.yml
+++ b/config/metrics/settings/20210216180907_direct_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.uploads.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180909_background_upload.yml b/config/metrics/settings/20210216180909_background_upload.yml
index e4800ee74a7..c18a22d1634 100644
--- a/config/metrics/settings/20210216180909_background_upload.yml
+++ b/config/metrics/settings/20210216180909_background_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.uploads.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180911_provider.yml b/config/metrics/settings/20210216180911_provider.yml
index c0e69fe0646..ba3f68dab4d 100644
--- a/config/metrics/settings/20210216180911_provider.yml
+++ b/config/metrics/settings/20210216180911_provider.yml
@@ -4,7 +4,7 @@ key_path: object_store.uploads.object_store.provider
 description: What Object Storage provider has been configured for Uploads
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
index 9411f1cacf8..7c91a7cbe5b 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.packages.enabled
 description: Whether Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180915_enabled.yml b/config/metrics/settings/20210216180915_enabled.yml
index 34649634deb..ae465ef80b3 100644
--- a/config/metrics/settings/20210216180915_enabled.yml
+++ b/config/metrics/settings/20210216180915_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.packages.object_store.enabled
 description: Whether Object Storage is enabled for Packages
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180916_direct_upload.yml b/config/metrics/settings/20210216180916_direct_upload.yml
index 3f5d354baa1..8628e5aeda9 100644
--- a/config/metrics/settings/20210216180916_direct_upload.yml
+++ b/config/metrics/settings/20210216180916_direct_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.packages.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for Packages
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180918_background_upload.yml b/config/metrics/settings/20210216180918_background_upload.yml
index d2e630e2a17..940273ff972 100644
--- a/config/metrics/settings/20210216180918_background_upload.yml
+++ b/config/metrics/settings/20210216180918_background_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.packages.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for Packages
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180920_provider.yml b/config/metrics/settings/20210216180920_provider.yml
index 6de7aed8801..88fd70061db 100644
--- a/config/metrics/settings/20210216180920_provider.yml
+++ b/config/metrics/settings/20210216180920_provider.yml
@@ -4,7 +4,7 @@ key_path: object_store.packages.object_store.provider
 description: What Object Storage provider has been configured for Packages
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category: memory
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216183241_filesystems.yml b/config/metrics/settings/20210216183241_filesystems.yml
index 216ca790638..b0df7200270 100644
--- a/config/metrics/settings/20210216183241_filesystems.yml
+++ b/config/metrics/settings/20210216183241_filesystems.yml
@@ -4,7 +4,7 @@ key_path: gitaly.filesystems
 description: Filesystem data for Gitaly installations
 product_section: dev
 product_stage: create
-product_group: group::gitaly
+product_group: gitaly
 product_category: gitaly
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210216183248_pg_system_id.yml b/config/metrics/settings/20210216183248_pg_system_id.yml
index a96994f9de6..a466872922e 100644
--- a/config/metrics/settings/20210216183248_pg_system_id.yml
+++ b/config/metrics/settings/20210216183248_pg_system_id.yml
@@ -4,7 +4,7 @@ key_path: database.pg_system_id
 description: TBD
 product_section: enablement
 product_stage: enablement
-product_group: group::distribution
+product_group: distribution
 product_category:
 value_type: number
 status: active
diff --git a/config/metrics/settings/20210225045628_operating_system.yml b/config/metrics/settings/20210225045628_operating_system.yml
index 3db6412cc13..5eeb45ea062 100644
--- a/config/metrics/settings/20210225045628_operating_system.yml
+++ b/config/metrics/settings/20210225045628_operating_system.yml
@@ -4,7 +4,7 @@ key_path: settings.operating_system
 description: Information about the operating system running GitLab
 product_section: enablement
 product_stage: enablement
-product_group: group::distribution
+product_group: distribution
 product_category: collection
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210321224827_gitaly_apdex.yml b/config/metrics/settings/20210321224827_gitaly_apdex.yml
index 6d5204f61bf..101c94157eb 100644
--- a/config/metrics/settings/20210321224827_gitaly_apdex.yml
+++ b/config/metrics/settings/20210321224827_gitaly_apdex.yml
@@ -4,7 +4,7 @@ key_path: settings.gitaly_apdex
 description: Gitaly application performance
 product_section: dev
 product_stage: create
-product_group: group::gitaly
+product_group: gitaly
 product_category: gitaly
 value_type: number
 status: active
diff --git a/config/metrics/settings/20210323120839_topology.yml b/config/metrics/settings/20210323120839_topology.yml
index d07de69e530..6cd6e91d2c4 100644
--- a/config/metrics/settings/20210323120839_topology.yml
+++ b/config/metrics/settings/20210323120839_topology.yml
@@ -4,7 +4,7 @@ key_path: topology
 description: Topology data
 product_section: enablement
 product_stage: enablement
-product_group: group::memory
+product_group: memory
 product_category:
 value_type: object
 status: active
diff --git a/config/metrics/settings/20210702140138_collected_data_categories.yml b/config/metrics/settings/20210702140138_collected_data_categories.yml
index 27262af8aa5..006a77f8b29 100644
--- a/config/metrics/settings/20210702140138_collected_data_categories.yml
+++ b/config/metrics/settings/20210702140138_collected_data_categories.yml
@@ -2,9 +2,9 @@
 key_path: settings.collected_data_categories
 name: collected_data_categories
 description: List of collected data categories corresponding to instance settings
-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: object
 status: active
diff --git a/config/metrics/settings/20210915152326_service_ping_features_enabled.yml b/config/metrics/settings/20210915152326_service_ping_features_enabled.yml
index 41101f0ff9d..d7e1a7f68bf 100644
--- a/config/metrics/settings/20210915152326_service_ping_features_enabled.yml
+++ b/config/metrics/settings/20210915152326_service_ping_features_enabled.yml
@@ -2,9 +2,9 @@
 key_path: settings.service_ping_features_enabled
 name: "service_ping_features_enabled"
 description: Whether Service Ping features are enabled
-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: boolean
 status: active
diff --git a/config/metrics/settings/20211124061450_snowplow_enabled.yml b/config/metrics/settings/20211124061450_snowplow_enabled.yml
index ae947115704..14662665cf7 100644
--- a/config/metrics/settings/20211124061450_snowplow_enabled.yml
+++ b/config/metrics/settings/20211124061450_snowplow_enabled.yml
@@ -2,9 +2,9 @@
 key_path: settings.snowplow_enabled
 name: snowplow_enabled_gitlab_instance
 description: Whether snowplow is enabled for the GitLab instance
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
+product_section: analytics
+product_stage: analytics
+product_group: product_intelligence
 product_category: product intelligence
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml b/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml
index 4dff0b2af2f..c634facdd92 100644
--- a/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml
+++ b/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml
@@ -2,9 +2,9 @@
 key_path: settings.snowplow_configured_to_gitlab_collector
 name: snowplow_configured_to_gitlab_collector
 description: Metric informs if currently configured Snowplow collector hostname points towards Gitlab Snowplow collection pipeline.
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
+product_section: analytics
+product_stage: analytics
+product_group: product_intelligence
 product_category: product intelligence
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20211201012652_flavor.yml b/config/metrics/settings/20211201012652_flavor.yml
index 3a409424eef..8148ad7ad89 100644
--- a/config/metrics/settings/20211201012652_flavor.yml
+++ b/config/metrics/settings/20211201012652_flavor.yml
@@ -6,7 +6,7 @@ description: What PostgreSQL flavor is being used. Possible values are
   or "null".
 product_section: enablement
 product_stage: enablement
-product_group: group::database
+product_group: database
 product_category: database
 value_type: string
 status: active
diff --git a/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml b/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml
index 6e17601e76d..f331aab7882 100644
--- a/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml
+++ b/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml
@@ -4,7 +4,7 @@ name: "certificate_based_clusters_ff"
 description: "Certificate-based clusters feature flag"
 product_section: ops
 product_stage: configure
-product_group: group::configure
+product_group: configure
 product_category:
 value_type: boolean
 status: active
diff --git a/config/puma.example.development.rb b/config/puma.example.development.rb
index ad33250011e..3164ffe3ef4 100644
--- a/config/puma.example.development.rb
+++ b/config/puma.example.development.rb
@@ -54,7 +54,8 @@ end
 
 before_fork do
   # Signal to the puma killer
-  Gitlab::Cluster::PumaWorkerKillerInitializer.start @config.options unless ENV['DISABLE_PUMA_WORKER_KILLER']
+  enable_puma_worker_killer = !Gitlab::Utils.to_boolean(ENV['DISABLE_PUMA_WORKER_KILLER'])
+  Gitlab::Cluster::PumaWorkerKillerInitializer.start(@config.options) if enable_puma_worker_killer
 
   # Signal application hooks that we're about to fork
   Gitlab::Cluster::LifecycleEvents.do_before_fork
diff --git a/config/routes.rb b/config/routes.rb
index 44e89f0d387..dd3095f0a8d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,334 +4,335 @@ require 'sidekiq/web'
 require 'sidekiq/cron/web'
 require 'product_analytics/collector_app'
 
-Rails.application.routes.draw do
-  concern :access_requestable do
-    post :request_access, on: :collection
-    post :approve_access_request, on: :member
-  end
+InitializerConnections.with_disabled_database_connections do
+  Rails.application.routes.draw do
+    concern :access_requestable do
+      post :request_access, on: :collection
+      post :approve_access_request, on: :member
+    end
 
-  concern :awardable do
-    post :toggle_award_emoji, on: :member
-  end
+    concern :awardable do
+      post :toggle_award_emoji, on: :member
+    end
 
-  favicon_redirect = redirect do |_params, _request|
-    ActionController::Base.helpers.asset_url(Gitlab::Favicon.main)
-  end
-  get 'favicon.png', to: favicon_redirect
-  get 'favicon.ico', to: favicon_redirect
+    favicon_redirect = redirect do |_params, _request|
+      ActionController::Base.helpers.asset_url(Gitlab::Favicon.main)
+    end
+    get 'favicon.png', to: favicon_redirect
+    get 'favicon.ico', to: favicon_redirect
 
-  draw :development
+    draw :development
 
-  use_doorkeeper do
-    controllers applications: 'oauth/applications',
-                authorized_applications: 'oauth/authorized_applications',
-                authorizations: 'oauth/authorizations',
-                token_info: 'oauth/token_info',
-                tokens: 'oauth/tokens'
-  end
+    use_doorkeeper do
+      controllers applications: 'oauth/applications',
+        authorized_applications: 'oauth/authorized_applications',
+        authorizations: 'oauth/authorizations',
+        token_info: 'oauth/token_info',
+        tokens: 'oauth/tokens'
+    end
 
-  # This prefixless path is required because Jira gets confused if we set it up with a path
-  # More information: https://gitlab.com/gitlab-org/gitlab/issues/6752
-  scope path: '/login/oauth', controller: 'oauth/jira_dvcs/authorizations', as: :oauth_jira_dvcs do
-    get :authorize, action: :new
-    get :callback
-    post :access_token
+    # This prefixless path is required because Jira gets confused if we set it up with a path
+    # More information: https://gitlab.com/gitlab-org/gitlab/issues/6752
+    scope path: '/login/oauth', controller: 'oauth/jira_dvcs/authorizations', as: :oauth_jira_dvcs do
+      get :authorize, action: :new
+      get :callback
+      post :access_token
 
-    match '*all', via: [:get, :post], to: proc { [404, {}, ['']] }
-  end
+      match '*all', via: [:get, :post], to: proc { [404, {}, ['']] }
+    end
 
-  draw :oauth
+    draw :oauth
 
-  use_doorkeeper_openid_connect do
-    controllers discovery: 'jwks'
-  end
+    use_doorkeeper_openid_connect do
+      controllers discovery: 'jwks'
+    end
 
-  # Add OPTIONS method for CORS preflight requests
-  match '/oauth/userinfo' => 'doorkeeper/openid_connect/userinfo#show', via: :options
-  match '/oauth/discovery/keys' => 'jwks#keys', via: :options
-  match '/.well-known/openid-configuration' => 'jwks#provider', via: :options
-  match '/.well-known/webfinger' => 'jwks#webfinger', via: :options
+    # Add OPTIONS method for CORS preflight requests
+    match '/oauth/userinfo' => 'doorkeeper/openid_connect/userinfo#show', via: :options
+    match '/oauth/discovery/keys' => 'jwks#keys', via: :options
+    match '/.well-known/openid-configuration' => 'jwks#provider', via: :options
+    match '/.well-known/webfinger' => 'jwks#webfinger', via: :options
 
-  match '/oauth/token' => 'oauth/tokens#create', via: :options
-  match '/oauth/revoke' => 'oauth/tokens#revoke', via: :options
+    match '/oauth/token' => 'oauth/tokens#create', via: :options
+    match '/oauth/revoke' => 'oauth/tokens#revoke', via: :options
 
-  # Sign up
-  scope path: '/users/sign_up', module: :registrations, as: :users_sign_up do
-    resource :welcome, only: [:show, :update], controller: 'welcome' do
-      Gitlab.ee do
-        get :trial_getting_started, on: :collection
-        get :trial_onboarding_board, on: :collection
-        get :continuous_onboarding_getting_started, on: :collection
+    match '/-/jira_connect/oauth_application_id' => 'jira_connect/oauth_application_ids#show', via: :options
+
+    # Sign up
+    scope path: '/users/sign_up', module: :registrations, as: :users_sign_up do
+      resource :welcome, only: [:show, :update], controller: 'welcome' do
+        Gitlab.ee do
+          get :trial_getting_started, on: :collection
+          get :trial_onboarding_board, on: :collection
+          get :continuous_onboarding_getting_started, on: :collection
+        end
       end
-    end
 
-    Gitlab.ee do
-      resource :company, only: [:new, :create], controller: 'company'
-      resources :groups, only: [:new, :create]
-      resources :projects, only: [:new, :create]
-      resources :groups_projects, only: [:new, :create] do
-        collection do
-          post :import
-          put :exit
+      Gitlab.ee do
+        resource :company, only: [:new, :create], controller: 'company'
+        resources :groups, only: [:new, :create]
+        resources :projects, only: [:new, :create]
+        resources :groups_projects, only: [:new, :create] do
+          collection do
+            post :import
+            put :exit
+          end
         end
+        draw :verification
       end
-      draw :verification
     end
-  end
 
-  # Search
-  get 'search' => 'search#show', as: :search
-  get 'search/autocomplete' => 'search#autocomplete', as: :search_autocomplete
-  get 'search/count' => 'search#count', as: :search_count
-  get 'search/opensearch' => 'search#opensearch', as: :search_opensearch
+    # Search
+    get 'search' => 'search#show', as: :search
+    get 'search/autocomplete' => 'search#autocomplete', as: :search_autocomplete
+    get 'search/count' => 'search#count', as: :search_count
+    get 'search/opensearch' => 'search#opensearch', as: :search_opensearch
 
-  # JSON Web Token
-  get 'jwt/auth' => 'jwt#auth'
+    # JSON Web Token
+    get 'jwt/auth' => 'jwt#auth'
 
-  # Health check
-  get 'health_check(/:checks)' => 'health_check#index', as: :health_check
+    # Health check
+    get 'health_check(/:checks)' => 'health_check#index', as: :health_check
 
-  # Terraform service discovery
-  get '.well-known/terraform.json' => 'terraform/services#index', as: :terraform_services
+    # Terraform service discovery
+    get '.well-known/terraform.json' => 'terraform/services#index', as: :terraform_services
 
-  # Begin of the /-/ scope.
-  # Use this scope for all new global routes.
-  scope path: '-' do
-    # Autocomplete
-    get '/autocomplete/users' => 'autocomplete#users'
-    get '/autocomplete/users/:id' => 'autocomplete#user'
-    get '/autocomplete/projects' => 'autocomplete#projects'
-    get '/autocomplete/award_emojis' => 'autocomplete#award_emojis'
-    get '/autocomplete/merge_request_target_branches' => 'autocomplete#merge_request_target_branches'
-    get '/autocomplete/deploy_keys_with_owners' => 'autocomplete#deploy_keys_with_owners'
+    # Begin of the /-/ scope.
+    # Use this scope for all new global routes.
+    scope path: '-' do
+      # Autocomplete
+      get '/autocomplete/users' => 'autocomplete#users'
+      get '/autocomplete/users/:id' => 'autocomplete#user'
+      get '/autocomplete/projects' => 'autocomplete#projects'
+      get '/autocomplete/award_emojis' => 'autocomplete#award_emojis'
+      get '/autocomplete/merge_request_target_branches' => 'autocomplete#merge_request_target_branches'
+      get '/autocomplete/deploy_keys_with_owners' => 'autocomplete#deploy_keys_with_owners'
 
-    Gitlab.ee do
-      get '/autocomplete/project_groups' => 'autocomplete#project_groups'
-      get '/autocomplete/project_routes' => 'autocomplete#project_routes'
-      get '/autocomplete/namespace_routes' => 'autocomplete#namespace_routes'
-      get '/autocomplete/group_subgroups' => 'autocomplete#group_subgroups'
-    end
+      Gitlab.ee do
+        get '/autocomplete/project_groups' => 'autocomplete#project_groups'
+        get '/autocomplete/project_routes' => 'autocomplete#project_routes'
+        get '/autocomplete/namespace_routes' => 'autocomplete#namespace_routes'
+        get '/autocomplete/group_subgroups' => 'autocomplete#group_subgroups'
+      end
 
-    # sandbox
-    get '/sandbox/mermaid' => 'sandbox#mermaid'
+      # sandbox
+      get '/sandbox/mermaid' => 'sandbox#mermaid'
 
-    get '/whats_new' => 'whats_new#index'
+      get '/whats_new' => 'whats_new#index'
 
-    get 'offline' => "pwa#offline"
-    get 'manifest' => "pwa#manifest", constraints: lambda { |req| req.format == :json }
+      get 'offline' => "pwa#offline"
+      get 'manifest' => "pwa#manifest", constraints: lambda { |req| req.format == :json }
 
-    # '/-/health' implemented by BasicHealthCheck middleware
-    get 'liveness' => 'health#liveness'
-    get 'readiness' => 'health#readiness'
-    controller :metrics do
-      get 'metrics', action: :index
-      get 'metrics/system', action: :system
-    end
-    mount Peek::Railtie => '/peek', as: 'peek_routes'
+      # '/-/health' implemented by BasicHealthCheck middleware
+      get 'liveness' => 'health#liveness'
+      get 'readiness' => 'health#readiness'
+      controller :metrics do
+        get 'metrics', action: :index
+        get 'metrics/system', action: :system
+      end
+      mount Peek::Railtie => '/peek', as: 'peek_routes'
 
-    get 'runner_setup/platforms' => 'runner_setup#platforms'
+      get 'runner_setup/platforms' => 'runner_setup#platforms'
 
-    # Boards resources shared between group and projects
-    resources :boards, only: [] do
-      resources :lists, module: :boards, only: [:index, :create, :update, :destroy] do
-        collection do
-          post :generate
-        end
+      # Boards resources shared between group and projects
+      resources :boards, only: [] do
+        resources :lists, module: :boards, only: [:index, :create, :update, :destroy] do
+          collection do
+            post :generate
+          end
 
-        resources :issues, only: [:index, :create, :update]
-      end
+          resources :issues, only: [:index, :create, :update]
+        end
 
-      resources :issues, module: :boards, only: [:index, :update] do
-        collection do
-          put :bulk_move, format: :json
+        resources :issues, module: :boards, only: [:index, :update] do
+          collection do
+            put :bulk_move, format: :json
+          end
         end
-      end
 
-      Gitlab.ee do
-        resources :users, module: :boards, only: [:index]
-        resources :milestones, module: :boards, only: [:index]
+        Gitlab.ee do
+          resources :users, module: :boards, only: [:index]
+          resources :milestones, module: :boards, only: [:index]
+        end
       end
-    end
-
-    get 'acme-challenge/' => 'acme_challenges#show'
 
-    scope :ide, as: :ide, format: false do
-      get '/', to: 'ide#index'
-      get '/project', to: 'ide#index'
+      get 'acme-challenge/' => 'acme_challenges#show'
 
-      scope path: 'project/:project_id', as: :project, constraints: { project_id: Gitlab::PathRegex.full_namespace_route_regex } do
-        %w[edit tree blob].each do |action|
-          get "/#{action}", to: 'ide#index'
-          get "/#{action}/*branch/-/*path", to: 'ide#index'
-          get "/#{action}/*branch/-", to: 'ide#index'
-          get "/#{action}/*branch", to: 'ide#index'
-        end
-
-        get '/merge_requests/:merge_request_id', to: 'ide#index', constraints: { merge_request_id: /\d+/ }
+      scope :ide, as: :ide, format: false do
         get '/', to: 'ide#index'
+        get '/project', to: 'ide#index'
+
+        scope path: 'project/:project_id', as: :project, constraints: { project_id: Gitlab::PathRegex.full_namespace_route_regex } do
+          %w[edit tree blob].each do |action|
+            get "/#{action}", to: 'ide#index'
+            get "/#{action}/*branch/-/*path", to: 'ide#index'
+            get "/#{action}/*branch/-", to: 'ide#index'
+            get "/#{action}/*branch", to: 'ide#index'
+          end
+
+          get '/merge_requests/:merge_request_id', to: 'ide#index', constraints: { merge_request_id: /\d+/ }
+          get '/', to: 'ide#index'
+        end
       end
-    end
 
-    draw :operations
-    draw :jira_connect
+      draw :operations
+      draw :jira_connect
 
-    Gitlab.ee do
-      draw :security
-      draw :smartcard
-      draw :trial
-      draw :trial_registration
-      draw :country
-      draw :country_state
-      draw :subscription
-
-      scope '/push_from_secondary/:geo_node_id' do
-        draw :git_http
+      Gitlab.ee do
+        draw :security
+        draw :smartcard
+        draw :trial
+        draw :trial_registration
+        draw :country
+        draw :country_state
+        draw :subscription
+
+        scope '/push_from_secondary/:geo_node_id' do
+          draw :git_http
+        end
       end
 
-      # Used for survey responses
-      resources :survey_responses, only: :index
-    end
-
-    Gitlab.jh do
-      draw :global_jh
-    end
+      Gitlab.jh do
+        draw :global_jh
+      end
 
-    if ENV['GITLAB_CHAOS_SECRET'] || Rails.env.development? || Rails.env.test?
-      resource :chaos, only: [] do
-        get :leakmem
-        get :cpu_spin
-        get :db_spin
-        get :sleep
-        get :kill
-        get :quit
-        post :gc
+      if ENV['GITLAB_CHAOS_SECRET'] || Rails.env.development? || Rails.env.test?
+        resource :chaos, only: [] do
+          get :leakmem
+          get :cpu_spin
+          get :db_spin
+          get :sleep
+          get :kill
+          get :quit
+          post :gc
+        end
       end
-    end
 
-    resources :invites, only: [:show], constraints: { id: /[A-Za-z0-9_-]+/ } do
-      member do
-        post :accept
-        match :decline, via: [:get, :post]
+      resources :invites, only: [:show], constraints: { id: /[A-Za-z0-9_-]+/ } do
+        member do
+          post :accept
+          match :decline, via: [:get, :post]
+        end
       end
-    end
 
-    resources :sent_notifications, only: [], constraints: { id: /\h{32}/ } do
-      member do
-        get :unsubscribe
+      resources :sent_notifications, only: [], constraints: { id: /\h{32}/ } do
+        member do
+          get :unsubscribe
+        end
       end
-    end
 
-    # Spam reports
-    resources :abuse_reports, only: [:new, :create]
+      # Spam reports
+      resources :abuse_reports, only: [:new, :create]
 
-    # JWKS (JSON Web Key Set) endpoint
-    # Used by third parties to verify CI_JOB_JWT
-    get 'jwks' => 'jwks#index'
+      # JWKS (JSON Web Key Set) endpoint
+      # Used by third parties to verify CI_JOB_JWT
+      get 'jwks' => 'jwks#index'
 
-    draw :snippets
-    draw :profile
+      draw :snippets
+      draw :profile
 
-    post '/mailgun/webhooks' => 'mailgun/webhooks#process_webhook'
+      post '/mailgun/webhooks' => 'mailgun/webhooks#process_webhook'
 
-    # Deprecated route for permanent failures
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/362606
-    post '/members/mailgun/permanent_failures' => 'mailgun/webhooks#process_webhook'
+      # Deprecated route for permanent failures
+      # https://gitlab.com/gitlab-org/gitlab/-/issues/362606
+      post '/members/mailgun/permanent_failures' => 'mailgun/webhooks#process_webhook'
 
-    # Product analytics collector
-    match '/collector/i', to: ProductAnalytics::CollectorApp.new, via: :all
-  end
-  # End of the /-/ scope.
-
-  concern :clusterable do
-    resources :clusters, only: [:index, :show, :update, :destroy] do
-      collection do
-        get  :connect
-        get  :new_cluster_docs
-        post :create_user
-      end
+      # Product analytics collector
+      match '/collector/i', to: ProductAnalytics::CollectorApp.new, via: :all
+    end
+    # End of the /-/ scope.
 
-      resource :integration, controller: 'clusters/integrations', only: [] do
+    concern :clusterable do
+      resources :clusters, only: [:index, :show, :update, :destroy] do
         collection do
-          post :create_or_update
+          get  :connect
+          get  :new_cluster_docs
+          post :create_user
         end
-      end
 
-      member do
-        Gitlab.ee do
-          get :metrics, format: :json
-          get :environments, format: :json
+        resource :integration, controller: 'clusters/integrations', only: [] do
+          collection do
+            post :create_or_update
+          end
         end
 
-        get :metrics_dashboard
-        get :'/prometheus/api/v1/*proxy_path', to: 'clusters#prometheus_proxy', as: :prometheus_api
-        get :cluster_status, format: :json
-        delete :clear_cache
+        member do
+          Gitlab.ee do
+            get :metrics, format: :json
+            get :environments, format: :json
+          end
+
+          get :metrics_dashboard
+          get :'/prometheus/api/v1/*proxy_path', to: 'clusters#prometheus_proxy', as: :prometheus_api
+          get :cluster_status, format: :json
+          delete :clear_cache
+        end
       end
     end
-  end
 
-  resources :groups, only: [:index, :new, :create] do
-    post :preview_markdown
-  end
+    resources :groups, only: [:index, :new, :create] do
+      post :preview_markdown
+    end
 
-  draw :group
-
-  resources :projects, only: [:index, :new, :create]
-
-  get '/projects/:id' => 'projects/redirect#redirect_from_id'
-
-  draw :git_http
-  draw :api
-  draw :customers_dot
-  draw :sidekiq
-  draw :help
-  draw :google_api
-  draw :import
-  draw :uploads
-  draw :explore
-  draw :admin
-  draw :dashboard
-  draw :user
-  draw :project
-  draw :unmatched_project
-
-  # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/210024
-  scope as: 'deprecated' do
-    # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/223719
-    get '/snippets/:id/raw',
-      to: 'snippets#raw',
-      format: false,
-      constraints: { id: /\d+/ }
-
-    Gitlab::Routing.redirect_legacy_paths(self, :snippets)
-  end
+    draw :group
+
+    resources :projects, only: [:index, :new, :create]
+
+    get '/projects/:id' => 'projects/redirect#redirect_from_id'
+
+    draw :git_http
+    draw :api
+    draw :customers_dot
+    draw :sidekiq
+    draw :help
+    draw :google_api
+    draw :import
+    draw :uploads
+    draw :explore
+    draw :admin
+    draw :dashboard
+    draw :user
+    draw :project
+    draw :unmatched_project
+
+    # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/210024
+    scope as: 'deprecated' do
+      # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/223719
+      get '/snippets/:id/raw',
+        to: 'snippets#raw',
+        format: false,
+        constraints: { id: /\d+/ }
+
+      Gitlab::Routing.redirect_legacy_paths(self, :snippets)
+    end
 
-  Gitlab.ee do
-    get '/sitemap' => 'sitemap#show', format: :xml
-  end
+    Gitlab.ee do
+      get '/sitemap' => 'sitemap#show', format: :xml
+    end
 
-  # Creates shorthand helper methods for project resources.
-  # For example; for the `namespace_project_path` this also creates `project_path`.
-  #
-  # TODO: We don't need the `Gitlab::Routing` module at all as we can use
-  # the `direct` DSL method of Rails to define url helpers. Move all the
-  # custom url helpers to use the `direct` DSL method and remove the `Gitlab::Routing`.
-  # For more information: https://gitlab.com/gitlab-org/gitlab/-/issues/299583
-  Gitlab::Application.routes.set.filter_map { |route| route.name if route.name&.include?('namespace_project') }.each do |name|
-    new_name = name.sub('namespace_project', 'project')
-
-    direct(new_name) do |project, *args|
-      # This is due to a bug I've found in Rails.
-      # For more information: https://gitlab.com/gitlab-org/gitlab/-/issues/299591
-      args.pop if args.last == {}
-
-      send("#{name}_url", project&.namespace, project, *args)
+    # Creates shorthand helper methods for project resources.
+    # For example; for the `namespace_project_path` this also creates `project_path`.
+    #
+    # TODO: We don't need the `Gitlab::Routing` module at all as we can use
+    # the `direct` DSL method of Rails to define url helpers. Move all the
+    # custom url helpers to use the `direct` DSL method and remove the `Gitlab::Routing`.
+    # For more information: https://gitlab.com/gitlab-org/gitlab/-/issues/299583
+    Gitlab::Application.routes.set.filter_map { |route| route.name if route.name&.include?('namespace_project') }.each do |name|
+      new_name = name.sub('namespace_project', 'project')
+
+      direct(new_name) do |project, *args|
+        # This is due to a bug I've found in Rails.
+        # For more information: https://gitlab.com/gitlab-org/gitlab/-/issues/299591
+        args.pop if args.last == {}
+
+        send("#{name}_url", project&.namespace, project, *args)
+      end
     end
-  end
 
-  root to: "root#index"
+    root to: "root#index"
 
-  get '*unmatched_route', to: 'application#route_not_found', format: false
-end
+    get '*unmatched_route', to: 'application#route_not_found', format: false
+  end
 
-Gitlab::Routing.add_helpers(TimeboxesRoutingHelper)
+  Gitlab::Routing.add_helpers(TimeboxesRoutingHelper)
+end
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 8148e92d0e5..bbf00cd0b00 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -61,7 +61,7 @@ namespace :admin do
     end
   end
 
-  resources :topics, only: [:index, :new, :create, :edit, :update] do
+  resources :topics, only: [:index, :new, :create, :edit, :update, :destroy] do
     resource :avatar, controller: 'topics/avatars', only: [:destroy]
     collection do
       post :preview_markdown
@@ -138,6 +138,7 @@ namespace :admin do
     get :usage_data
     put :reset_registration_token
     put :reset_health_check_token
+    put :reset_error_tracking_access_token
     put :clear_repository_check_states
     match :general, :integrations, :repository, :ci_cd, :reporting, :metrics_and_profiling, :network, :preferences, via: [:get, :patch]
     get :lets_encrypt_terms_of_service
diff --git a/config/routes/group.rb b/config/routes/group.rb
index bf6094ff2f1..2a5931207b0 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -118,10 +118,17 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
     end
 
     resources :container_registries, only: [:index, :show], controller: 'registry/repositories'
-    resources :harbor_registries, only: [:index, :show], controller: 'harbor/repositories'
     resource :dependency_proxy, only: [:show, :update]
     resources :email_campaigns, only: :index
 
+    namespace :harbor do
+      resources :repositories, only: [:index] do
+        resources :artifacts, only: [:index] do
+          resources :tags, only: [:index]
+        end
+      end
+    end
+
     resources :autocomplete_sources, only: [] do
       collection do
         get 'members'
diff --git a/config/routes/project.rb b/config/routes/project.rb
index afc06780471..5eb0b9396c9 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -221,20 +221,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        # Legacy routes for `/-/integrations` which are now in `/-/settings/integrations`.
-        # Can be removed in 15.2, see https://gitlab.com/gitlab-org/gitlab/-/issues/334846
-        resources :integrations, controller: 'settings/integrations', constraints: { id: %r{[^/]+} }, only: [:edit, :update] do
-          member do
-            put :test
-          end
-
-          resources :hook_logs, only: [:show], controller: 'settings/integration_hook_logs' do
-            member do
-              post :retry
-            end
-          end
-        end
-
         resources :boards, only: [:index, :show, :create, :update, :destroy], constraints: { id: /\d+/ } do
           collection do
             get :recent
@@ -252,13 +238,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        resources :logs, only: [:index] do
-          collection do
-            get :k8s
-            get :elasticsearch
-          end
-        end
-
         resources :starrers, only: [:index]
         resources :forks, only: [:index, :new, :create]
         resources :group_links, only: [:update, :destroy], constraints: { id: /\d+|:id/ }
@@ -319,15 +298,18 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
 
         resources :terraform, only: [:index]
 
-        resources :google_cloud, only: [:index]
-
         namespace :google_cloud do
+          get '/configuration', to: 'configuration#index'
+
           resources :revoke_oauth, only: [:create]
           resources :service_accounts, only: [:index, :create]
           resources :gcp_regions, only: [:index, :create]
 
+          get '/deployments', to: 'deployments#index'
           get '/deployments/cloud_run', to: 'deployments#cloud_run'
           get '/deployments/cloud_storage', to: 'deployments#cloud_storage'
+
+          get '/databases', to: 'databases#index'
         end
 
         resources :environments, except: [:destroy] do
@@ -377,8 +359,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
 
         get 'work_items/*work_items_path' => 'work_items#index', as: :work_items
 
-        resource :tracing, only: [:show]
-
         post 'incidents/integrations/pagerduty', to: 'incident_management/pager_duty_incidents#create'
 
         resources :incidents, only: [:index]
@@ -480,6 +460,14 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
             end
           end
         end
+
+        namespace :harbor do
+          resources :repositories, only: [:index, :show] do
+            resources :artifacts, only: [:index] do
+              resources :tags, only: [:index]
+            end
+          end
+        end
       end
       # End of the /-/ scope.
 
@@ -546,9 +534,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
       resources :container_registry, only: [:index, :destroy, :show], # rubocop: disable Cop/PutProjectRoutesUnderScope
                                      controller: 'registry/repositories'
 
-      resources :harbor_registry, only: [:index, :show], # rubocop: disable Cop/PutProjectRoutesUnderScope
-                                  controller: 'harbor/repositories'
-
       namespace :registry do
         resources :repository, only: [] do # rubocop: disable Cop/PutProjectRoutesUnderScope
           # We default to JSON format in the controller to avoid ambiguity.
@@ -638,7 +623,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
                                             :commits, :commit, :find_file, :files, :compare,
                                             :cycle_analytics, :mattermost, :variables, :triggers,
                                             :environments, :protected_environments, :error_tracking, :alert_management,
-                                            :tracing,
                                             :serverless, :clusters, :audit_events, :wikis, :merge_requests,
                                             :vulnerability_feedback, :security, :dependencies, :issues,
                                             :pipelines, :pipeline_schedules, :runners, :snippets)
diff --git a/config/routes/user.rb b/config/routes/user.rb
index ccacf817cc5..96e8c850da4 100644
--- a/config/routes/user.rb
+++ b/config/routes/user.rb
@@ -15,7 +15,7 @@ end
 # Use custom controller for LDAP omniauth callback
 if Gitlab::Auth::Ldap::Config.sign_in_enabled?
   devise_scope :user do
-    Gitlab::Auth::Ldap::Config.available_servers.each do |server|
+    Gitlab::Auth::Ldap::Config.servers.each do |server|
       override_omniauth(server['provider_name'], 'ldap/omniauth_callbacks')
     end
   end
@@ -53,6 +53,8 @@ end
 
 devise_scope :user do
   get '/users/almost_there' => 'confirmations#almost_there'
+  post '/users/resend_verification_code', to: 'sessions#resend_verification_code'
+  get '/users/successful_verification', to: 'sessions#successful_verification'
 end
 
 scope '-/users', module: :users do
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 2838f0a8436..c901ea09f4c 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -193,6 +193,8 @@
   - 2
 - - gitlab_subscriptions_notify_seats_exceeded
   - 1
+- - google_cloud_create_cloudsql_instance
+  - 1
 - - group_destroy
   - 1
 - - group_export
@@ -221,6 +223,8 @@
   - 2
 - - incident_management_apply_incident_sla_exceeded_label
   - 1
+- - incident_management_close_incident
+  - 1
 - - incident_management_oncall_rotations_persist_shifts_job
   - 1
 - - incident_management_pending_escalations_alert_check
@@ -239,8 +243,6 @@
   - 1
 - - invalid_gpg_signature_update
   - 2
-- - irker
-  - 1
 - - issuable_export_csv
   - 1
 - - issuable_label_links_destroy
@@ -327,7 +329,7 @@
   - 1
 - - pages_domain_verification
   - 1
-- - pages_transfer
+- - pages_invalidate_domain_cache
   - 1
 - - personal_access_tokens
   - 1
@@ -355,8 +357,6 @@
   - 1
 - - project_import_schedule
   - 1
-- - project_service
-  - 1
 - - project_template_export
   - 1
 - - projects_after_import
@@ -469,8 +469,6 @@
   - 1
 - - web_hook
   - 1
-- - web_hooks_destroy
-  - 1
 - - web_hooks_log_destroy
   - 1
 - - web_hooks_log_execution
diff --git a/config/webpack.config.js b/config/webpack.config.js
index aff906353f6..3c1d7cbf631 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -158,7 +158,6 @@ const alias = {
   images: path.join(ROOT_PATH, 'app/assets/images'),
   vendor: path.join(ROOT_PATH, 'vendor/assets/javascripts'),
   jquery$: 'jquery/dist/jquery.slim.js',
-  jest: path.join(ROOT_PATH, 'spec/frontend'),
   shared_queries: path.join(ROOT_PATH, 'app/graphql/queries'),
 
   // the following resolves files which are different between CE and EE
@@ -175,6 +174,16 @@ const alias = {
     ROOT_PATH,
     'app/assets/javascripts/lib/utils/icons_path.js',
   ),
+
+  // test-environment-only aliases duplicated from Jest config
+  'spec/test_constants$': path.join(ROOT_PATH, 'spec/frontend/__helpers__/test_constants'),
+  ee_else_ce_jest: path.join(ROOT_PATH, 'spec/frontend'),
+  helpers: path.join(ROOT_PATH, 'spec/frontend/__helpers__'),
+  jest: path.join(ROOT_PATH, 'spec/frontend'),
+  test_fixtures: path.join(ROOT_PATH, 'tmp/tests/frontend/fixtures'),
+  test_fixtures_static: path.join(ROOT_PATH, 'spec/frontend/fixtures/static'),
+  test_helpers: path.join(ROOT_PATH, 'spec/frontend_integration/test_helpers'),
+  public: path.join(ROOT_PATH, 'public'),
 };
 
 if (IS_EE) {
@@ -184,10 +193,14 @@ if (IS_EE) {
     ee_empty_states: path.join(ROOT_PATH, 'ee/app/views/shared/empty_states'),
     ee_icons: path.join(ROOT_PATH, 'ee/app/views/shared/icons'),
     ee_images: path.join(ROOT_PATH, 'ee/app/assets/images'),
-    ee_jest: path.join(ROOT_PATH, 'ee/spec/frontend'),
     ee_else_ce: path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
     jh_else_ee: path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
     any_else_ce: path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
+
+    // test-environment-only aliases duplicated from Jest config
+    ee_else_ce_jest: path.join(ROOT_PATH, 'ee/spec/frontend'),
+    ee_jest: path.join(ROOT_PATH, 'ee/spec/frontend'),
+    test_fixtures: path.join(ROOT_PATH, 'tmp/tests/frontend/fixtures-ee'),
   });
 }
 
@@ -198,21 +211,13 @@ if (IS_JH) {
     jh_empty_states: path.join(ROOT_PATH, 'jh/app/views/shared/empty_states'),
     jh_icons: path.join(ROOT_PATH, 'jh/app/views/shared/icons'),
     jh_images: path.join(ROOT_PATH, 'jh/app/assets/images'),
-    jh_jest: path.join(ROOT_PATH, 'jh/spec/frontend'),
     // jh path alias https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74305#note_732793956
     jh_else_ce: path.join(ROOT_PATH, 'jh/app/assets/javascripts'),
     jh_else_ee: path.join(ROOT_PATH, 'jh/app/assets/javascripts'),
     any_else_ce: path.join(ROOT_PATH, 'jh/app/assets/javascripts'),
-  });
-}
 
-if (!IS_PRODUCTION) {
-  const fixtureDir = IS_EE ? 'fixtures-ee' : 'fixtures';
-
-  Object.assign(alias, {
-    test_fixtures: path.join(ROOT_PATH, `tmp/tests/frontend/${fixtureDir}`),
-    test_fixtures_static: path.join(ROOT_PATH, 'spec/frontend/fixtures/static'),
-    test_helpers: path.join(ROOT_PATH, 'spec/frontend_integration/test_helpers'),
+    // test-environment-only aliases duplicated from Jest config
+    jh_jest: path.join(ROOT_PATH, 'jh/spec/frontend'),
   });
 }