Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'config/metrics/counts_all')
-rw-r--r--config/metrics/counts_all/20210201124934_deployments.yml2
-rw-r--r--config/metrics/counts_all/20210204124930_servers.yml2
-rw-r--r--config/metrics/counts_all/20210204124932_clusters.yml2
-rw-r--r--config/metrics/counts_all/20210216174832_cycle_analytics_views.yml2
-rw-r--r--config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml2
-rw-r--r--config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml2
-rw-r--r--config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml2
-rw-r--r--config/metrics/counts_all/20210216175026_service_desk_issues.yml2
-rw-r--r--config/metrics/counts_all/20210216175037_suggestions.yml2
-rw-r--r--config/metrics/counts_all/20210216175039_merge_requests.yml2
-rw-r--r--config/metrics/counts_all/20210216175041_merge_request_comment.yml2
-rw-r--r--config/metrics/counts_all/20210216175043_merge_request_create.yml2
-rw-r--r--config/metrics/counts_all/20210216175045_merge_requests.yml2
-rw-r--r--config/metrics/counts_all/20210216175053_suggestions.yml2
-rw-r--r--config/metrics/counts_all/20210216175229_auto_devops_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175231_auto_devops_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175232_clusters.yml2
-rw-r--r--config/metrics/counts_all/20210216175234_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175236_project_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175238_group_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175242_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175244_project_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175246_group_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml2
-rw-r--r--config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml2
-rw-r--r--config/metrics/counts_all/20210216175253_clusters_platforms_user.yml2
-rw-r--r--config/metrics/counts_all/20210216175255_clusters_applications_helm.yml2
-rw-r--r--config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml2
-rw-r--r--config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml2
-rw-r--r--config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml2
-rw-r--r--config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml2
-rw-r--r--config/metrics/counts_all/20210216175305_clusters_applications_runner.yml2
-rw-r--r--config/metrics/counts_all/20210216175307_clusters_applications_knative.yml2
-rw-r--r--config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml2
-rw-r--r--config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml2
-rw-r--r--config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml2
-rw-r--r--config/metrics/counts_all/20210216175314_clusters_management_project.yml2
-rw-r--r--config/metrics/counts_all/20210216175316_kubernetes_agents.yml2
-rw-r--r--config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml2
-rw-r--r--config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml2
-rw-r--r--config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml2
-rw-r--r--config/metrics/counts_all/20210216175324_terraform_reports.yml2
-rw-r--r--config/metrics/counts_all/20210216175326_terraform_states.yml2
-rw-r--r--config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml2
-rw-r--r--config/metrics/counts_all/20210216175331_clusters_applications_helm.yml2
-rw-r--r--config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml2
-rw-r--r--config/metrics/counts_all/20210216175335_clusters_applications_knative.yml2
-rw-r--r--config/metrics/counts_all/20210216175337_clusters_management_project.yml2
-rw-r--r--config/metrics/counts_all/20210216175339_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175341_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml2
-rw-r--r--config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml2
-rw-r--r--config/metrics/counts_all/20210216175346_clusters_platforms_user.yml2
-rw-r--r--config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175352_group_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175354_group_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175356_project_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175358_project_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml2
-rw-r--r--config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml2
-rw-r--r--config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml2
-rw-r--r--config/metrics/counts_all/20210216175446_network_policy_forwards.yml2
-rw-r--r--config/metrics/counts_all/20210216175448_network_policy_drops.yml2
-rw-r--r--config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml2
-rw-r--r--config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml2
-rw-r--r--config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml2
-rw-r--r--config/metrics/counts_all/20210216175510_ci_builds.yml2
-rw-r--r--config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml2
-rw-r--r--config/metrics/counts_all/20210216175514_ci_external_pipelines.yml2
-rw-r--r--config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml2
-rw-r--r--config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml2
-rw-r--r--config/metrics/counts_all/20210216175520_ci_runners.yml2
-rw-r--r--config/metrics/counts_all/20210216175521_ci_triggers.yml2
-rw-r--r--config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml2
-rw-r--r--config/metrics/counts_all/20210216175525_ci_builds.yml2
-rw-r--r--config/metrics/counts_all/20210216175527_ci_external_pipelines.yml2
-rw-r--r--config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml2
-rw-r--r--config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml2
-rw-r--r--config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml2
-rw-r--r--config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml2
-rw-r--r--config/metrics/counts_all/20210216175537_ci_pipelines.yml2
-rw-r--r--config/metrics/counts_all/20210216175539_ci_triggers.yml2
-rw-r--r--config/metrics/counts_all/20210216175621_web_hooks.yml2
-rw-r--r--config/metrics/counts_all/20210216175623_projects_asana_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175625_groups_asana_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175627_templates_asana_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175628_instances_asana_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175634_projects_assembla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175636_groups_assembla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175638_templates_assembla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175640_instances_assembla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175645_projects_bamboo_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175647_groups_bamboo_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175649_templates_bamboo_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175651_instances_bamboo_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175708_projects_buildkite_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175710_groups_buildkite_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175712_templates_buildkite_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175714_instances_buildkite_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175719_projects_campfire_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175721_groups_campfire_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175723_templates_campfire_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175725_instances_campfire_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175731_projects_confluence_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175733_groups_confluence_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175734_templates_confluence_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175736_instances_confluence_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175753_projects_discord_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175755_groups_discord_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175756_templates_discord_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175758_instances_discord_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175837_projects_flowdock_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175839_groups_flowdock_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175840_templates_flowdock_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175842_instances_flowdock_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175910_projects_hipchat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175912_groups_hipchat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175913_templates_hipchat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175915_instances_hipchat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175921_projects_irker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175923_groups_irker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175924_templates_irker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175926_instances_irker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175932_projects_jenkins_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175934_groups_jenkins_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175935_templates_jenkins_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175937_instances_jenkins_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175943_projects_jira_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175945_groups_jira_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175946_templates_jira_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175948_instances_jira_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175954_projects_mattermost_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175956_groups_mattermost_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175957_templates_mattermost_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175959_instances_mattermost_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180027_projects_packagist_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180029_groups_packagist_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180030_templates_packagist_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180032_instances_packagist_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180100_projects_pushover_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180102_groups_pushover_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180104_templates_pushover_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180105_instances_pushover_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180111_projects_redmine_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180113_groups_redmine_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180115_templates_redmine_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180116_instances_redmine_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180122_projects_slack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180124_groups_slack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180126_templates_slack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180127_instances_slack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180144_projects_teamcity_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180146_groups_teamcity_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180148_templates_teamcity_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180149_instances_teamcity_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180217_projects_youtrack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180219_groups_youtrack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180221_templates_youtrack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180223_instances_youtrack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180228_projects_jira_server_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180239_personal_snippets.yml2
-rw-r--r--config/metrics/counts_all/20210216180241_project_snippets.yml2
-rw-r--r--config/metrics/counts_all/20210216180242_web_ide_commits.yml2
-rw-r--r--config/metrics/counts_all/20210216180244_web_ide_views.yml2
-rw-r--r--config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml2
-rw-r--r--config/metrics/counts_all/20210216180248_web_ide_previews.yml2
-rw-r--r--config/metrics/counts_all/20210216180250_web_ide_terminals.yml2
-rw-r--r--config/metrics/counts_all/20210216180252_web_ide_pipelines.yml2
-rw-r--r--config/metrics/counts_all/20210216180253_snippet_comment.yml2
-rw-r--r--config/metrics/counts_all/20210216180255_snippet_create.yml2
-rw-r--r--config/metrics/counts_all/20210216180257_snippet_update.yml2
-rw-r--r--config/metrics/counts_all/20210216180259_static_site_editor_views.yml2
-rw-r--r--config/metrics/counts_all/20210216180301_static_site_editor_commits.yml2
-rw-r--r--config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml2
-rw-r--r--config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216180306_snippets.yml2
-rw-r--r--config/metrics/counts_all/20210216180316_snippets.yml2
-rw-r--r--config/metrics/counts_all/20210216180410_pool_repositories.yml2
-rw-r--r--config/metrics/counts_all/20210216180413_all_searches.yml2
-rw-r--r--config/metrics/counts_all/20210216180414_navbar_searches.yml2
-rw-r--r--config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml2
-rw-r--r--config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml2
-rw-r--r--config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml2
-rw-r--r--config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml2
-rw-r--r--config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml2
-rw-r--r--config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml2
-rw-r--r--config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml2
-rw-r--r--config/metrics/counts_all/20210216180447_incident_issues.yml2
-rw-r--r--config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml2
-rw-r--r--config/metrics/counts_all/20210216180451_incident_labeled_issues.yml2
-rw-r--r--config/metrics/counts_all/20210216180453_projects_creating_incidents.yml2
-rw-r--r--config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml2
-rw-r--r--config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml2
-rw-r--r--config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216180518_projects_with_incidents.yml2
-rw-r--r--config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml2
-rw-r--r--config/metrics/counts_all/20210216180628_projects_imported_from_github.yml2
-rw-r--r--config/metrics/counts_all/20210216180630_projects_imported_from_github.yml2
-rw-r--r--config/metrics/counts_all/20210216180632_unique_users_all_imports.yml2
-rw-r--r--config/metrics/counts_all/20210216180634_gitlab.yml2
-rw-r--r--config/metrics/counts_all/20210216180636_gitlab_v1.yml2
-rw-r--r--config/metrics/counts_all/20210216180638_gitlab_project.yml2
-rw-r--r--config/metrics/counts_all/20210216180639_gitlab.yml2
-rw-r--r--config/metrics/counts_all/20210216180641_github.yml2
-rw-r--r--config/metrics/counts_all/20210216180643_bitbucket.yml2
-rw-r--r--config/metrics/counts_all/20210216180645_bitbucket_server.yml2
-rw-r--r--config/metrics/counts_all/20210216180647_gitea.yml2
-rw-r--r--config/metrics/counts_all/20210216180649_git.yml2
-rw-r--r--config/metrics/counts_all/20210216180650_manifest.yml2
-rw-r--r--config/metrics/counts_all/20210216180652_gitlab_migration.yml2
-rw-r--r--config/metrics/counts_all/20210216180654_jira.yml2
-rw-r--r--config/metrics/counts_all/20210216180656_fogbugz.yml2
-rw-r--r--config/metrics/counts_all/20210216180658_phabricator.yml2
-rw-r--r--config/metrics/counts_all/20210216180700_csv.yml2
-rw-r--r--config/metrics/counts_all/20210216180702_group_import.yml2
-rw-r--r--config/metrics/counts_all/20210216180703_gitlab_migration.yml2
-rw-r--r--config/metrics/counts_all/20210216180705_total.yml2
-rw-r--r--config/metrics/counts_all/20210216180707_gitlab_project.yml2
-rw-r--r--config/metrics/counts_all/20210216180709_gitlab.yml2
-rw-r--r--config/metrics/counts_all/20210216180711_github.yml2
-rw-r--r--config/metrics/counts_all/20210216180713_bitbucket.yml2
-rw-r--r--config/metrics/counts_all/20210216180715_bitbucket_server.yml2
-rw-r--r--config/metrics/counts_all/20210216180716_gitea.yml2
-rw-r--r--config/metrics/counts_all/20210216180718_git.yml2
-rw-r--r--config/metrics/counts_all/20210216180720_manifest.yml2
-rw-r--r--config/metrics/counts_all/20210216180722_jira.yml2
-rw-r--r--config/metrics/counts_all/20210216180724_fogbugz.yml2
-rw-r--r--config/metrics/counts_all/20210216180726_phabricator.yml2
-rw-r--r--config/metrics/counts_all/20210216180727_csv.yml2
-rw-r--r--config/metrics/counts_all/20210216180729_groups_imported.yml2
-rw-r--r--config/metrics/counts_all/20210216180734_wiki_pages_create.yml2
-rw-r--r--config/metrics/counts_all/20210216180736_wiki_pages_update.yml2
-rw-r--r--config/metrics/counts_all/20210216180738_wiki_pages_delete.yml2
-rw-r--r--config/metrics/counts_all/20210216180740_design_management_designs_create.yml2
-rw-r--r--config/metrics/counts_all/20210216180741_design_management_designs_update.yml2
-rw-r--r--config/metrics/counts_all/20210216180743_design_management_designs_delete.yml2
-rw-r--r--config/metrics/counts_all/20210216180750_groups.yml2
-rw-r--r--config/metrics/counts_all/20210216180752_keys.yml2
-rw-r--r--config/metrics/counts_all/20210216180754_events.yml2
-rw-r--r--config/metrics/counts_all/20210216180756_groups.yml2
-rw-r--r--config/metrics/counts_all/20210216180758_users_created.yml2
-rw-r--r--config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml2
-rw-r--r--config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml6
-rw-r--r--config/metrics/counts_all/20210216180931_projects_prometheus_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180933_groups_prometheus_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180934_templates_prometheus_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180936_instances_prometheus_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml2
-rw-r--r--config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml2
-rw-r--r--config/metrics/counts_all/20210216180945_clusters.yml2
-rw-r--r--config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml2
-rw-r--r--config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml2
-rw-r--r--config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml6
-rw-r--r--config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml2
-rw-r--r--config/metrics/counts_all/20210216181009_lfs_objects.yml2
-rw-r--r--config/metrics/counts_all/20210216181011_projects_with_packages.yml2
-rw-r--r--config/metrics/counts_all/20210216181012_packages.yml2
-rw-r--r--config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml2
-rw-r--r--config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml2
-rw-r--r--config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml2
-rw-r--r--config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml2
-rw-r--r--config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml2
-rw-r--r--config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml2
-rw-r--r--config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml2
-rw-r--r--config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml2
-rw-r--r--config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml2
-rw-r--r--config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml2
-rw-r--r--config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml2
-rw-r--r--config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml2
-rw-r--r--config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml2
-rw-r--r--config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml2
-rw-r--r--config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml2
-rw-r--r--config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml2
-rw-r--r--config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml2
-rw-r--r--config/metrics/counts_all/20210216181051_vendor.yml2
-rw-r--r--config/metrics/counts_all/20210216181055_projects_with_packages.yml2
-rw-r--r--config/metrics/counts_all/20210216181102_issues.yml2
-rw-r--r--config/metrics/counts_all/20210216181104_label_lists.yml2
-rw-r--r--config/metrics/counts_all/20210216181108_milestones.yml2
-rw-r--r--config/metrics/counts_all/20210216181109_uploads.yml2
-rw-r--r--config/metrics/counts_all/20210216181111_labels.yml2
-rw-r--r--config/metrics/counts_all/20210216181113_notes.yml2
-rw-r--r--config/metrics/counts_all/20210216181115_issues.yml2
-rw-r--r--config/metrics/counts_all/20210216181117_notes.yml2
-rw-r--r--config/metrics/counts_all/20210216181119_projects.yml2
-rw-r--r--config/metrics/counts_all/20210216181121_todos.yml2
-rw-r--r--config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml2
-rw-r--r--config/metrics/counts_all/20210216181124_service_desk_issues.yml2
-rw-r--r--config/metrics/counts_all/20210216181126_projects_jira_active.yml2
-rw-r--r--config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml2
-rw-r--r--config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml2
-rw-r--r--config/metrics/counts_all/20210216181134_epics.yml2
-rw-r--r--config/metrics/counts_all/20210216181135_label_lists.yml2
-rw-r--r--config/metrics/counts_all/20210216181249_feature_flags.yml2
-rw-r--r--config/metrics/counts_all/20210216181252_boards.yml2
-rw-r--r--config/metrics/counts_all/20210216181254_projects.yml2
-rw-r--r--config/metrics/counts_all/20210216181256_todos.yml2
-rw-r--r--config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml2
-rw-r--r--config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml2
-rw-r--r--config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml2
-rw-r--r--config/metrics/counts_all/20210216181908_deploy_keys.yml2
-rw-r--r--config/metrics/counts_all/20210216181911_successful_deployments.yml2
-rw-r--r--config/metrics/counts_all/20210216181912_failed_deployments.yml2
-rw-r--r--config/metrics/counts_all/20210216181914_environments.yml2
-rw-r--r--config/metrics/counts_all/20210216181916_in_review_folder.yml2
-rw-r--r--config/metrics/counts_all/20210216181918_releases.yml4
-rw-r--r--config/metrics/counts_all/20210216181926_deployments.yml2
-rw-r--r--config/metrics/counts_all/20210216181928_failed_deployments.yml2
-rw-r--r--config/metrics/counts_all/20210216181930_releases.yml2
-rw-r--r--config/metrics/counts_all/20210216181932_successful_deployments.yml2
-rw-r--r--config/metrics/counts_all/20210216181946_pages_domains.yml2
-rw-r--r--config/metrics/counts_all/20210216181949_clusters_applications_runner.yml2
-rw-r--r--config/metrics/counts_all/20210216182002_remote_mirrors.yml2
-rw-r--r--config/metrics/counts_all/20210216182004_commit_comment.yml2
-rw-r--r--config/metrics/counts_all/20210216182006_source_code_pushes.yml2
-rw-r--r--config/metrics/counts_all/20210216182010_deploy_keys.yml2
-rw-r--r--config/metrics/counts_all/20210216182012_keys.yml2
-rw-r--r--config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml2
-rw-r--r--config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml2
-rw-r--r--config/metrics/counts_all/20210216182017_remote_mirrors.yml2
-rw-r--r--config/metrics/counts_all/20210216182454_protected_branches_except_default.yml2
-rw-r--r--config/metrics/counts_all/20210216182547_projects_datadog_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182549_groups_datadog_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182551_templates_datadog_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182553_instances_datadog_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182614_projects_ewm_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182616_groups_ewm_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182618_templates_ewm_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182620_instances_ewm_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml2
-rw-r--r--config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml2
-rw-r--r--config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml2
-rw-r--r--config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml2
-rw-r--r--config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml2
-rw-r--r--config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml2
-rw-r--r--config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml2
-rw-r--r--config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml2
-rw-r--r--config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml2
-rw-r--r--config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216183023_wiki_pages_view.yml2
-rw-r--r--config/metrics/counts_all/20210216183400_omniauth_providers.yml2
-rw-r--r--config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml2
-rw-r--r--config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml2
-rw-r--r--config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml2
-rw-r--r--config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml2
-rw-r--r--config/metrics/counts_all/20210502050942_ci_runners_online.yml2
-rw-r--r--config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml2
-rw-r--r--config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml2
-rw-r--r--config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml2
-rw-r--r--config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml2
-rw-r--r--config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210514141520_project_imports_total.yml2
-rw-r--r--config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml6
-rw-r--r--config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml2
-rw-r--r--config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml2
-rw-r--r--config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml2
-rw-r--r--config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml2
-rw-r--r--config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml2
-rw-r--r--config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml2
-rw-r--r--config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml2
-rw-r--r--config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml2
-rw-r--r--config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml2
-rw-r--r--config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml2
-rw-r--r--config/metrics/counts_all/20210715094459_releases_with_milestones.yml2
-rw-r--r--config/metrics/counts_all/20210723075525_diff_searches.yml2
-rw-r--r--config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml2
-rw-r--r--config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml2
-rw-r--r--config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml2
-rw-r--r--config/metrics/counts_all/20210730011801_projects_zentao_active.yml2
-rw-r--r--config/metrics/counts_all/20210730011802_groups_zentao_active.yml2
-rw-r--r--config/metrics/counts_all/20210730011804_instances_zentao_active.yml2
-rw-r--r--config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml2
-rw-r--r--config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml2
-rw-r--r--config/metrics/counts_all/20210910132001_user_auth_by_provider.yml2
-rw-r--r--config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml2
-rw-r--r--config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml2
-rw-r--r--config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml2
-rw-r--r--config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml2
-rw-r--r--config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml2
-rw-r--r--config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml6
-rw-r--r--config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml2
-rw-r--r--config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml2
-rw-r--r--config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml2
-rw-r--r--config/metrics/counts_all/20211028210001_projects_shimo_active.yml2
-rw-r--r--config/metrics/counts_all/20211028210002_groups_shimo_active.yml2
-rw-r--r--config/metrics/counts_all/20211028210003_instances_shimo_active.yml2
-rw-r--r--config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml2
-rw-r--r--config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml2
-rw-r--r--config/metrics/counts_all/20220122022215_web_ide_previews_success.yml2
-rw-r--r--config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml8
-rw-r--r--config/metrics/counts_all/20220315180122_projects_harbor_active.yml2
-rw-r--r--config/metrics/counts_all/20220315180124_groups_harbor_active.yml2
-rw-r--r--config/metrics/counts_all/20220315180127_instances_harbor_active.yml2
-rw-r--r--config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml2
-rw-r--r--config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml2
609 files changed, 625 insertions, 617 deletions
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