From a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 16 Jun 2021 18:25:58 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-0-stable-ee

---
 config/metrics/aggregates/code_review.yml          |  6 +++++
 .../counts_28d/20210216175542_ci_builds.yml        |  2 +-
 .../20210216175544_ci_external_pipelines.yml       |  3 +--
 .../20210216175546_ci_internal_pipelines.yml       |  2 +-
 ...0210216175550_ci_pipeline_config_repository.yml |  2 +-
 .../20210216175552_ci_pipeline_schedules.yml       |  2 +-
 .../counts_28d/20210216175554_ci_pipelines.yml     |  2 +-
 .../counts_28d/20210216175556_ci_triggers.yml      |  2 +-
 .../20210216180308_personal_snippets.yml           |  3 +--
 .../counts_28d/20210216180310_project_snippets.yml |  3 +--
 .../metrics/counts_28d/20210216180312_snippets.yml |  1 -
 .../metrics/counts_28d/20210216180317_snippets.yml |  6 ++---
 ...19_action_monthly_active_users_web_ide_edit.yml |  8 +++---
 ...180321_action_monthly_active_users_sfe_edit.yml |  8 +++---
 ...on_monthly_active_users_snippet_editor_edit.yml | 10 +++++---
 ...180325_action_monthly_active_users_sse_edit.yml | 10 +++++---
 ...180327_action_monthly_active_users_ide_edit.yml |  8 +++---
 .../20210216180330_g_edit_by_web_ide_monthly.yml   |  8 +++---
 .../20210216180334_g_edit_by_sfe_monthly.yml       |  8 +++---
 ...0210216180338_g_edit_by_snippet_ide_monthly.yml |  8 +++---
 ...180341_ide_edit_total_unique_counts_monthly.yml |  8 +++---
 ...tion_monthly_active_users_design_management.yml | 12 +++++----
 ...80747_action_monthly_active_users_wiki_repo.yml | 10 +++++---
 .../metrics/counts_28d/20210216180816_groups.yml   | 14 ++++++-----
 .../counts_28d/20210216180818_users_created.yml    | 11 ++++----
 .../counts_28d/20210216180820_ldap_keys.yml        | 16 ------------
 .../counts_28d/20210216180822_ldap_users.yml       | 16 ------------
 ...10216180955_projects_with_prometheus_alerts.yml |  3 ++-
 .../metrics/counts_28d/20210216181050_packages.yml | 10 +++++---
 .../20210216181057_projects_with_packages.yml      | 10 +++++---
 ...210216181508_i_quickactions_approve_monthly.yml |  5 +++-
 .../20210216183627_omniauth_providers.yml          | 15 +++++------
 .../counts_28d/20210216183629_two-factor.yml       | 15 +++++------
 .../20210216183631_two-factor-via-u2f-device.yml   | 15 +++++------
 ...210216183633_two-factor-via-webauthn-device.yml | 15 +++++------
 .../metrics/counts_28d/20210216183634_standard.yml | 15 +++++------
 .../counts_28d/20210216183636_google_oauth2.yml    | 15 +++++------
 .../20210216183638_unique_users_all_imports.yml    | 14 ++++++-----
 .../counts_28d/20210216183644_gitlab_project.yml   | 12 +++++----
 .../metrics/counts_28d/20210216183646_gitlab.yml   | 14 ++++++-----
 .../metrics/counts_28d/20210216183648_github.yml   | 18 ++++++++------
 .../counts_28d/20210216183650_bitbucket.yml        | 18 ++++++++------
 .../counts_28d/20210216183652_bitbucket_server.yml | 18 ++++++++------
 config/metrics/counts_28d/20210216183653_gitea.yml | 16 ++++++------
 config/metrics/counts_28d/20210216183655_git.yml   | 14 ++++++-----
 .../metrics/counts_28d/20210216183657_manifest.yml | 12 +++++----
 .../counts_28d/20210216183659_gitlab_migration.yml | 12 +++++----
 .../counts_28d/20210216183709_group_import.yml     | 18 ++++++++------
 .../counts_28d/20210216183720_bitbucket.yml        | 16 ++++++------
 .../counts_28d/20210216183722_bitbucket_server.yml | 14 ++++++-----
 .../counts_28d/20210216183737_groups_imported.yml  |  6 ++---
 .../20210216183828_dependency_scanning_scans.yml   | 16 ------------
 .../20210216184024_g_edit_by_sse_monthly.yml       | 14 ++++++-----
 .../20210216184255_i_snippets_show_monthly.yml     | 14 ++++++-----
 ...nique_users_committing_ciconfigfile_monthly.yml | 14 ++++++-----
 ...59_ci_templates_total_unique_counts_monthly.yml | 18 ++++++++------
 ...806_i_package_composer_deploy_token_monthly.yml | 14 ++++++-----
 ...184810_i_package_conan_deploy_token_monthly.yml | 14 ++++++-----
 ...14_i_package_container_deploy_token_monthly.yml | 16 ++++++------
 ...84818_i_package_debian_deploy_token_monthly.yml | 16 ++++++------
 ...4822_i_package_generic_deploy_token_monthly.yml | 17 +++++++------
 ...84826_i_package_golang_deploy_token_monthly.yml | 16 ++++++------
 ...184830_i_package_maven_deploy_token_monthly.yml | 14 ++++++-----
 ...16184834_i_package_npm_deploy_token_monthly.yml | 14 ++++++-----
 ...184838_i_package_nuget_deploy_token_monthly.yml | 14 ++++++-----
 ...6184842_i_package_pypi_deploy_token_monthly.yml | 15 ++++++-----
 ...16184846_i_package_tag_deploy_token_monthly.yml | 16 ++++++------
 ..._token_packages_total_unique_counts_monthly.yml | 14 ++++++-----
 ...10216184854_i_package_composer_user_monthly.yml | 14 ++++++-----
 ...20210216184858_i_package_conan_user_monthly.yml | 14 ++++++-----
 ...0216184902_i_package_container_user_monthly.yml | 16 ++++++------
 ...0210216184906_i_package_debian_user_monthly.yml | 16 ++++++------
 ...210216184910_i_package_generic_user_monthly.yml | 17 +++++++------
 ...0210216184913_i_package_golang_user_monthly.yml | 16 ++++++------
 ...20210216184917_i_package_maven_user_monthly.yml | 14 ++++++-----
 .../20210216184921_i_package_npm_user_monthly.yml  | 14 ++++++-----
 ...20210216184925_i_package_nuget_user_monthly.yml | 14 ++++++-----
 .../20210216184929_i_package_pypi_user_monthly.yml | 14 ++++++-----
 .../20210216184933_i_package_tag_user_monthly.yml  | 16 ++++++------
 ...7_user_packages_total_unique_counts_monthly.yml | 14 ++++++-----
 ..._ecosystem_jira_service_close_issue_monthly.yml | 14 ++++++-----
 ...system_jira_service_cross_reference_monthly.yml | 14 ++++++-----
 ..._ecosystem_jira_service_list_issues_monthly.yml | 16 ------------
 ...ecosystem_jira_service_create_issue_monthly.yml | 16 ------------
 ...84957_ecosystem_total_unique_counts_monthly.yml | 14 ++++++-----
 ...626_i_package_rubygems_deploy_token_monthly.yml |  3 +--
 ...10303154654_i_package_rubygems_user_monthly.yml |  2 +-
 ...rs_expanding_secure_security_report_monthly.yml |  2 +-
 ...panding_testing_code_quality_report_monthly.yml |  2 +-
 ...anding_testing_accessibility_report_monthly.yml |  2 +-
 ...ckage_terraform_module_deploy_token_monthly.yml |  2 +-
 ...208_i_package_terraform_module_user_monthly.yml |  2 +-
 ...5507_i_testing_summary_widget_total_monthly.yml |  2 +-
 ...view_click_single_file_mode_setting_monthly.yml |  2 +-
 ...e_review_click_file_browser_setting_monthly.yml |  2 +-
 ...ode_review_click_whitespace_setting_monthly.yml |  2 +-
 ...1516_i_code_review_diff_view_inline_monthly.yml |  2 +-
 ...13_i_code_review_diff_view_parallel_monthly.yml |  2 +-
 ..._code_review_file_browser_tree_view_monthly.yml |  2 +-
 ..._code_review_file_browser_list_view_monthly.yml |  2 +-
 ..._i_code_review_diff_show_whitespace_monthly.yml |  2 +-
 ..._i_code_review_diff_hide_whitespace_monthly.yml |  2 +-
 ...2121_i_code_review_diff_single_file_monthly.yml |  2 +-
 ...2_i_code_review_diff_multiple_files_monthly.yml |  2 +-
 ...8_code_review_category_monthly_active_users.yml |  2 +-
 ...iew_extension_category_monthly_active_users.yml |  2 +-
 ...3119_code_review_group_monthly_active_users.yml |  2 +-
 ...eline_authoring_total_unique_counts_monthly.yml |  2 +-
 ...0210427213346_geo_secondary_web_oauth_users.yml |  2 +-
 ...i_code_review_user_resolve_conflict_monthly.yml | 21 ++++++++++++++++
 ...i_code_review_user_load_conflict_ui_monthly.yml | 21 ++++++++++++++++
 .../20210514141518_monthly_projects_creation.yml   | 20 +++++++++++++++
 ...7074859_i_package_helm_deploy_token_monthly.yml | 20 +++++++++++++++
 .../20210517075259_i_package_helm_user_monthly.yml | 20 +++++++++++++++
 config/metrics/counts_28d/20210520111133_total.yml | 20 +++++++++++++++
 ...code_review_click_diff_view_setting_monthly.yml | 19 ++++++++++++++
 .../20210216180328_g_edit_by_web_ide_weekly.yml    | 18 ++++++++++++++
 .../20210216180332_g_edit_by_sfe_weekly.yml        | 18 ++++++++++++++
 ...20210216180336_g_edit_by_snippet_ide_weekly.yml | 18 ++++++++++++++
 ...6180339_ide_edit_total_unique_counts_weekly.yml | 18 ++++++++++++++
 ...0210216181506_i_quickactions_approve_weekly.yml |  5 +++-
 .../20210216184022_g_edit_by_sse_weekly.yml        | 18 ++++++++++++++
 .../20210216184253_i_snippets_show_weekly.yml      | 18 ++++++++++++++
 ...unique_users_committing_ciconfigfile_weekly.yml | 18 ++++++++++++++
 ...557_ci_templates_total_unique_counts_weekly.yml | 20 +++++++++++++++
 ...4805_i_package_composer_deploy_token_weekly.yml | 18 ++++++++++++++
 ...6184808_i_package_conan_deploy_token_weekly.yml | 18 ++++++++++++++
 ...812_i_package_container_deploy_token_weekly.yml | 18 ++++++++++++++
 ...184816_i_package_debian_deploy_token_weekly.yml | 18 ++++++++++++++
 ...84820_i_package_generic_deploy_token_weekly.yml | 18 ++++++++++++++
 ...184824_i_package_golang_deploy_token_weekly.yml | 18 ++++++++++++++
 ...6184828_i_package_maven_deploy_token_weekly.yml | 18 ++++++++++++++
 ...216184832_i_package_npm_deploy_token_weekly.yml | 18 ++++++++++++++
 ...6184836_i_package_nuget_deploy_token_weekly.yml | 18 ++++++++++++++
 ...16184840_i_package_pypi_deploy_token_weekly.yml | 18 ++++++++++++++
 ...216184844_i_package_tag_deploy_token_weekly.yml | 18 ++++++++++++++
 ...y_token_packages_total_unique_counts_weekly.yml | 18 ++++++++++++++
 ...210216184852_i_package_composer_user_weekly.yml | 18 ++++++++++++++
 .../20210216184856_i_package_conan_user_weekly.yml | 18 ++++++++++++++
 ...10216184900_i_package_container_user_weekly.yml | 18 ++++++++++++++
 ...20210216184904_i_package_debian_user_weekly.yml | 18 ++++++++++++++
 ...0210216184908_i_package_generic_user_weekly.yml | 19 ++++++++++++++
 ...20210216184911_i_package_golang_user_weekly.yml | 18 ++++++++++++++
 .../20210216184916_i_package_maven_user_weekly.yml | 18 ++++++++++++++
 .../20210216184919_i_package_npm_user_weekly.yml   | 18 ++++++++++++++
 .../20210216184923_i_package_nuget_user_weekly.yml | 18 ++++++++++++++
 .../20210216184927_i_package_pypi_user_weekly.yml  | 18 ++++++++++++++
 .../20210216184931_i_package_tag_user_weekly.yml   | 18 ++++++++++++++
 ...35_user_packages_total_unique_counts_weekly.yml | 18 ++++++++++++++
 ...i_ecosystem_jira_service_close_issue_weekly.yml | 18 ++++++++++++++
 ...osystem_jira_service_cross_reference_weekly.yml | 18 ++++++++++++++
 ...184955_ecosystem_total_unique_counts_weekly.yml | 18 ++++++++++++++
 ...4624_i_package_rubygems_deploy_token_weekly.yml |  2 +-
 ...210303154652_i_package_rubygems_user_weekly.yml |  3 +--
 ...ers_expanding_secure_security_report_weekly.yml |  2 +-
 ...xpanding_testing_code_quality_report_weekly.yml |  2 +-
 ...panding_testing_accessibility_report_weekly.yml |  2 +-
 ...ackage_terraform_module_deploy_token_weekly.yml |  2 +-
 ...2209_i_package_terraform_module_user_weekly.yml |  2 +-
 ...05507_i_testing_summary_widget_total_weekly.yml |  2 +-
 ...eview_click_single_file_mode_setting_weekly.yml |  2 +-
 ...de_review_click_file_browser_setting_weekly.yml |  2 +-
 ...code_review_click_whitespace_setting_weekly.yml |  2 +-
 ...01512_i_code_review_diff_view_inline_weekly.yml |  2 +-
 ...609_i_code_review_diff_view_parallel_weekly.yml |  2 +-
 ...i_code_review_file_browser_tree_view_weekly.yml |  2 +-
 ...i_code_review_file_browser_list_view_weekly.yml |  2 +-
 ...5_i_code_review_diff_show_whitespace_weekly.yml |  2 +-
 ...7_i_code_review_diff_hide_whitespace_weekly.yml |  2 +-
 ...02118_i_code_review_diff_single_file_weekly.yml |  2 +-
 ...59_i_code_review_diff_multiple_files_weekly.yml |  2 +-
 ...3328_code_review_group_monthly_active_users.yml |  2 +-
 ...7_code_review_category_monthly_active_users.yml |  2 +-
 ...iew_extension_category_monthly_active_users.yml |  2 +-
 ...peline_authoring_total_unique_counts_weekly.yml |  2 +-
 ..._i_code_review_user_load_conflict_ui_weekly.yml | 21 ++++++++++++++++
 ..._i_code_review_user_resolve_conflict_weekly.yml | 21 ++++++++++++++++
 ...17074851_i_package_helm_deploy_token_weekly.yml | 20 +++++++++++++++
 .../20210517075252_i_package_helm_user_weekly.yml  | 20 +++++++++++++++
 ..._code_review_click_diff_view_setting_weekly.yml | 19 ++++++++++++++
 .../counts_all/20210216174826_ldap_users.yml       | 19 --------------
 .../20210216174832_cycle_analytics_views.yml       |  8 +++---
 ...10216175019_projects_with_prometheus_alerts.yml |  5 ++--
 .../20210216175021_pod_logs_usages_total.yml       |  5 ++--
 ...0210216175024_service_desk_enabled_projects.yml |  1 -
 .../20210216175026_service_desk_issues.yml         |  1 -
 .../20210216175028_requirements_created.yml        | 16 ------------
 ...10216175403_projects_with_prometheus_alerts.yml |  3 ++-
 ...75442_ingress_modsecurity_packets_processed.yml |  3 ++-
 ...75444_ingress_modsecurity_packets_anomalous.yml |  3 ++-
 .../20210216175450_ingress_modsecurity_logging.yml |  3 ++-
 ...20210216175452_ingress_modsecurity_blocking.yml |  3 ++-
 ...20210216175454_ingress_modsecurity_disabled.yml |  3 ++-
 ...216175456_ingress_modsecurity_not_installed.yml |  3 ++-
 .../counts_all/20210216175510_ci_builds.yml        |  2 +-
 .../20210216175512_ci_internal_pipelines.yml       |  2 +-
 .../20210216175514_ci_external_pipelines.yml       |  2 +-
 ...0210216175518_ci_pipeline_config_repository.yml |  2 +-
 .../counts_all/20210216175520_ci_runners.yml       |  2 +-
 .../counts_all/20210216175521_ci_triggers.yml      |  2 +-
 .../20210216175523_ci_pipeline_schedules.yml       |  2 +-
 .../counts_all/20210216175525_ci_builds.yml        |  2 +-
 .../20210216175527_ci_external_pipelines.yml       |  2 +-
 .../20210216175529_ci_internal_pipelines.yml       |  2 +-
 ...0210216175533_ci_pipeline_config_repository.yml |  2 +-
 .../20210216175535_ci_pipeline_schedules.yml       |  2 +-
 .../counts_all/20210216175537_ci_pipelines.yml     |  2 +-
 .../counts_all/20210216175539_ci_triggers.yml      |  2 +-
 .../20210216175623_projects_asana_active.yml       |  1 -
 .../20210216175625_groups_asana_active.yml         |  1 -
 .../20210216175627_templates_asana_active.yml      |  1 -
 .../20210216175628_instances_asana_active.yml      |  1 -
 ...0216175630_projects_inheriting_asana_active.yml |  1 -
 ...210216175632_groups_inheriting_asana_active.yml |  1 -
 .../20210216175634_projects_assembla_active.yml    |  1 -
 .../20210216175636_groups_assembla_active.yml      |  1 -
 .../20210216175638_templates_assembla_active.yml   |  1 -
 .../20210216175640_instances_assembla_active.yml   |  1 -
 ...6175642_projects_inheriting_assembla_active.yml |  1 -
 ...216175644_groups_inheriting_assembla_active.yml |  1 -
 .../20210216175645_projects_bamboo_active.yml      |  1 -
 .../20210216175647_groups_bamboo_active.yml        |  1 -
 .../20210216175649_templates_bamboo_active.yml     |  1 -
 .../20210216175651_instances_bamboo_active.yml     |  1 -
 ...216175653_projects_inheriting_bamboo_active.yml |  1 -
 ...10216175655_groups_inheriting_bamboo_active.yml |  1 -
 .../20210216175657_projects_bugzilla_active.yml    |  1 -
 .../20210216175659_groups_bugzilla_active.yml      |  1 -
 .../20210216175701_templates_bugzilla_active.yml   |  1 -
 .../20210216175702_instances_bugzilla_active.yml   |  1 -
 ...6175704_projects_inheriting_bugzilla_active.yml |  1 -
 ...216175706_groups_inheriting_bugzilla_active.yml |  1 -
 .../20210216175708_projects_buildkite_active.yml   |  1 -
 .../20210216175710_groups_buildkite_active.yml     |  1 -
 .../20210216175712_templates_buildkite_active.yml  |  1 -
 .../20210216175714_instances_buildkite_active.yml  |  1 -
 ...175716_projects_inheriting_buildkite_active.yml |  1 -
 ...16175717_groups_inheriting_buildkite_active.yml |  1 -
 .../20210216175719_projects_campfire_active.yml    |  1 -
 .../20210216175721_groups_campfire_active.yml      |  1 -
 .../20210216175723_templates_campfire_active.yml   |  1 -
 .../20210216175725_instances_campfire_active.yml   |  1 -
 ...6175727_projects_inheriting_campfire_active.yml |  1 -
 ...216175729_groups_inheriting_campfire_active.yml |  1 -
 .../20210216175731_projects_confluence_active.yml  |  1 -
 .../20210216175733_groups_confluence_active.yml    |  1 -
 .../20210216175734_templates_confluence_active.yml |  1 -
 .../20210216175736_instances_confluence_active.yml |  1 -
 ...75738_projects_inheriting_confluence_active.yml |  1 -
 ...6175740_groups_inheriting_confluence_active.yml |  1 -
 ...175742_projects_custom_issue_tracker_active.yml |  1 -
 ...16175744_groups_custom_issue_tracker_active.yml |  1 -
 ...75745_templates_custom_issue_tracker_active.yml |  1 -
 ...75747_instances_custom_issue_tracker_active.yml |  1 -
 ...ects_inheriting_custom_issue_tracker_active.yml |  1 -
 ...oups_inheriting_custom_issue_tracker_active.yml |  1 -
 .../20210216175753_projects_discord_active.yml     |  1 -
 .../20210216175755_groups_discord_active.yml       |  1 -
 .../20210216175756_templates_discord_active.yml    |  1 -
 .../20210216175758_instances_discord_active.yml    |  1 -
 ...16175800_projects_inheriting_discord_active.yml |  1 -
 ...0216175802_groups_inheriting_discord_active.yml |  1 -
 .../20210216175804_projects_drone_ci_active.yml    |  1 -
 .../20210216175806_groups_drone_ci_active.yml      |  1 -
 .../20210216175807_templates_drone_ci_active.yml   |  1 -
 .../20210216175809_instances_drone_ci_active.yml   |  1 -
 ...6175811_projects_inheriting_drone_ci_active.yml |  1 -
 ...216175813_groups_inheriting_drone_ci_active.yml |  1 -
 ...210216175815_projects_emails_on_push_active.yml |  1 -
 ...20210216175817_groups_emails_on_push_active.yml |  1 -
 ...10216175818_templates_emails_on_push_active.yml |  1 -
 ...10216175820_instances_emails_on_push_active.yml |  1 -
 ...2_projects_inheriting_emails_on_push_active.yml |  1 -
 ...824_groups_inheriting_emails_on_push_active.yml |  1 -
 ...0210216175826_projects_external_wiki_active.yml |  1 -
 .../20210216175828_groups_external_wiki_active.yml |  1 -
 ...210216175829_templates_external_wiki_active.yml |  1 -
 ...210216175831_instances_external_wiki_active.yml |  1 -
 ...33_projects_inheriting_external_wiki_active.yml |  1 -
 ...5835_groups_inheriting_external_wiki_active.yml |  1 -
 .../20210216175837_projects_flowdock_active.yml    |  1 -
 .../20210216175839_groups_flowdock_active.yml      |  1 -
 .../20210216175840_templates_flowdock_active.yml   |  1 -
 .../20210216175842_instances_flowdock_active.yml   |  1 -
 ...6175844_projects_inheriting_flowdock_active.yml |  1 -
 ...216175846_groups_inheriting_flowdock_active.yml |  1 -
 .../20210216175848_projects_github_active.yml      | 19 --------------
 .../20210216175850_groups_github_active.yml        | 19 --------------
 .../20210216175851_templates_github_active.yml     | 19 --------------
 .../20210216175853_instances_github_active.yml     | 19 --------------
 ...216175855_projects_inheriting_github_active.yml | 19 --------------
 ...10216175857_groups_inheriting_github_active.yml | 19 --------------
 ...0210216175859_projects_hangouts_chat_active.yml |  1 -
 .../20210216175901_groups_hangouts_chat_active.yml |  1 -
 ...210216175902_templates_hangouts_chat_active.yml |  1 -
 ...210216175904_instances_hangouts_chat_active.yml |  1 -
 ...06_projects_inheriting_hangouts_chat_active.yml |  1 -
 ...5908_groups_inheriting_hangouts_chat_active.yml |  1 -
 .../20210216175910_projects_hipchat_active.yml     |  1 -
 .../20210216175912_groups_hipchat_active.yml       |  1 -
 .../20210216175913_templates_hipchat_active.yml    |  1 -
 .../20210216175915_instances_hipchat_active.yml    |  1 -
 ...16175917_projects_inheriting_hipchat_active.yml |  1 -
 ...0216175919_groups_inheriting_hipchat_active.yml |  1 -
 .../20210216175921_projects_irker_active.yml       |  1 -
 .../20210216175923_groups_irker_active.yml         |  1 -
 .../20210216175924_templates_irker_active.yml      |  1 -
 .../20210216175926_instances_irker_active.yml      |  1 -
 ...0216175928_projects_inheriting_irker_active.yml |  1 -
 ...210216175930_groups_inheriting_irker_active.yml |  1 -
 .../20210216175932_projects_jenkins_active.yml     |  1 -
 .../20210216175934_groups_jenkins_active.yml       |  1 -
 .../20210216175935_templates_jenkins_active.yml    |  1 -
 .../20210216175937_instances_jenkins_active.yml    |  1 -
 ...16175939_projects_inheriting_jenkins_active.yml |  1 -
 ...0216175941_groups_inheriting_jenkins_active.yml |  1 -
 .../20210216175943_projects_jira_active.yml        |  1 -
 .../20210216175945_groups_jira_active.yml          |  1 -
 .../20210216175946_templates_jira_active.yml       |  1 -
 .../20210216175948_instances_jira_active.yml       |  1 -
 ...10216175950_projects_inheriting_jira_active.yml |  1 -
 ...0210216175952_groups_inheriting_jira_active.yml |  1 -
 .../20210216175954_projects_mattermost_active.yml  |  1 -
 .../20210216175956_groups_mattermost_active.yml    |  1 -
 .../20210216175957_templates_mattermost_active.yml |  1 -
 .../20210216175959_instances_mattermost_active.yml |  1 -
 ...80001_projects_inheriting_mattermost_active.yml |  1 -
 ...6180003_groups_inheriting_mattermost_active.yml |  1 -
 ...5_projects_mattermost_slash_commands_active.yml |  1 -
 ...006_groups_mattermost_slash_commands_active.yml |  1 -
 ..._templates_mattermost_slash_commands_active.yml |  1 -
 ..._instances_mattermost_slash_commands_active.yml |  1 -
 ...inheriting_mattermost_slash_commands_active.yml |  1 -
 ...inheriting_mattermost_slash_commands_active.yml |  1 -
 ...10216180016_projects_microsoft_teams_active.yml |  1 -
 ...0210216180018_groups_microsoft_teams_active.yml |  1 -
 ...0216180019_templates_microsoft_teams_active.yml |  1 -
 ...0216180021_instances_microsoft_teams_active.yml |  1 -
 ..._projects_inheriting_microsoft_teams_active.yml |  1 -
 ...25_groups_inheriting_microsoft_teams_active.yml |  1 -
 .../20210216180027_projects_packagist_active.yml   |  1 -
 .../20210216180029_groups_packagist_active.yml     |  1 -
 .../20210216180030_templates_packagist_active.yml  |  1 -
 .../20210216180032_instances_packagist_active.yml  |  1 -
 ...180034_projects_inheriting_packagist_active.yml |  1 -
 ...16180036_groups_inheriting_packagist_active.yml |  1 -
 ...10216180038_projects_pipelines_email_active.yml |  1 -
 ...0210216180040_groups_pipelines_email_active.yml |  1 -
 ...0216180041_templates_pipelines_email_active.yml |  1 -
 ...0216180043_instances_pipelines_email_active.yml |  1 -
 ..._projects_inheriting_pipelines_email_active.yml |  1 -
 ...47_groups_inheriting_pipelines_email_active.yml |  1 -
 ...210216180049_projects_pivotaltracker_active.yml |  1 -
 ...20210216180051_groups_pivotaltracker_active.yml |  1 -
 ...10216180052_templates_pivotaltracker_active.yml |  1 -
 ...10216180054_instances_pivotaltracker_active.yml |  1 -
 ...6_projects_inheriting_pivotaltracker_active.yml |  1 -
 ...058_groups_inheriting_pivotaltracker_active.yml |  1 -
 .../20210216180100_projects_pushover_active.yml    |  1 -
 .../20210216180102_groups_pushover_active.yml      |  1 -
 .../20210216180104_templates_pushover_active.yml   |  1 -
 .../20210216180105_instances_pushover_active.yml   |  1 -
 ...6180107_projects_inheriting_pushover_active.yml |  1 -
 ...216180109_groups_inheriting_pushover_active.yml |  1 -
 .../20210216180111_projects_redmine_active.yml     |  1 -
 .../20210216180113_groups_redmine_active.yml       |  1 -
 .../20210216180115_templates_redmine_active.yml    |  1 -
 .../20210216180116_instances_redmine_active.yml    |  1 -
 ...16180118_projects_inheriting_redmine_active.yml |  1 -
 ...0216180120_groups_inheriting_redmine_active.yml |  1 -
 .../20210216180122_projects_slack_active.yml       |  1 -
 .../20210216180124_groups_slack_active.yml         |  1 -
 .../20210216180126_templates_slack_active.yml      |  1 -
 .../20210216180127_instances_slack_active.yml      |  1 -
 ...0216180129_projects_inheriting_slack_active.yml |  1 -
 ...210216180131_groups_inheriting_slack_active.yml |  1 -
 ...180133_projects_slack_slash_commands_active.yml |  1 -
 ...16180135_groups_slack_slash_commands_active.yml |  1 -
 ...80137_templates_slack_slash_commands_active.yml |  1 -
 ...80138_instances_slack_slash_commands_active.yml |  1 -
 ...ects_inheriting_slack_slash_commands_active.yml |  1 -
 ...oups_inheriting_slack_slash_commands_active.yml |  1 -
 .../20210216180144_projects_teamcity_active.yml    |  1 -
 .../20210216180146_groups_teamcity_active.yml      |  1 -
 .../20210216180148_templates_teamcity_active.yml   |  1 -
 .../20210216180149_instances_teamcity_active.yml   |  1 -
 ...6180151_projects_inheriting_teamcity_active.yml |  1 -
 ...216180153_groups_inheriting_teamcity_active.yml |  1 -
 ...0210216180155_projects_unify_circuit_active.yml |  1 -
 .../20210216180157_groups_unify_circuit_active.yml |  1 -
 ...210216180159_templates_unify_circuit_active.yml |  1 -
 ...210216180201_instances_unify_circuit_active.yml |  1 -
 ...03_projects_inheriting_unify_circuit_active.yml |  1 -
 ...0204_groups_inheriting_unify_circuit_active.yml |  1 -
 .../20210216180206_projects_webex_teams_active.yml |  1 -
 .../20210216180208_groups_webex_teams_active.yml   |  1 -
 ...20210216180210_templates_webex_teams_active.yml |  1 -
 ...20210216180212_instances_webex_teams_active.yml |  1 -
 ...0214_projects_inheriting_webex_teams_active.yml |  1 -
 ...180215_groups_inheriting_webex_teams_active.yml |  1 -
 .../20210216180217_projects_youtrack_active.yml    |  1 -
 .../20210216180219_groups_youtrack_active.yml      |  1 -
 .../20210216180221_templates_youtrack_active.yml   |  1 -
 .../20210216180223_instances_youtrack_active.yml   |  1 -
 ...6180225_projects_inheriting_youtrack_active.yml |  1 -
 ...216180226_groups_inheriting_youtrack_active.yml |  1 -
 .../20210216180228_projects_jira_server_active.yml |  1 -
 .../20210216180230_projects_jira_cloud_active.yml  |  1 -
 ...10216180232_projects_jira_dvcs_cloud_active.yml |  1 -
 ...0216180234_projects_jira_dvcs_server_active.yml |  1 -
 .../20210216180239_personal_snippets.yml           |  3 +--
 .../counts_all/20210216180241_project_snippets.yml |  3 +--
 .../counts_all/20210216180242_web_ide_commits.yml  |  5 ++--
 .../counts_all/20210216180244_web_ide_views.yml    |  5 ++--
 .../20210216180246_web_ide_merge_requests.yml      |  5 ++--
 .../counts_all/20210216180248_web_ide_previews.yml |  5 ++--
 .../20210216180250_web_ide_terminals.yml           |  5 ++--
 .../20210216180252_web_ide_pipelines.yml           |  5 ++--
 .../counts_all/20210216180253_snippet_comment.yml  |  3 +--
 .../counts_all/20210216180255_snippet_create.yml   |  3 +--
 .../counts_all/20210216180257_snippet_update.yml   |  3 +--
 .../20210216180259_static_site_editor_views.yml    |  5 ++--
 .../20210216180301_static_site_editor_commits.yml  |  8 +++---
 ...216180303_static_site_editor_merge_requests.yml |  6 +++--
 ...180304_user_preferences_user_gitpod_enabled.yml |  5 ++--
 .../metrics/counts_all/20210216180306_snippets.yml |  1 -
 .../metrics/counts_all/20210216180316_snippets.yml |  6 ++---
 .../20210216180453_projects_creating_incidents.yml |  2 +-
 .../counts_all/20210216180638_gitlab_project.yml   |  6 +++--
 .../metrics/counts_all/20210216180639_gitlab.yml   |  6 +++--
 .../metrics/counts_all/20210216180641_github.yml   |  6 +++--
 .../counts_all/20210216180643_bitbucket.yml        |  6 +++--
 .../counts_all/20210216180645_bitbucket_server.yml |  6 +++--
 config/metrics/counts_all/20210216180647_gitea.yml |  6 +++--
 config/metrics/counts_all/20210216180649_git.yml   |  6 +++--
 .../metrics/counts_all/20210216180650_manifest.yml |  6 +++--
 .../counts_all/20210216180652_gitlab_migration.yml |  6 +++--
 .../20210216180734_wiki_pages_create.yml           | 10 +++++---
 .../20210216180736_wiki_pages_update.yml           | 10 +++++---
 .../20210216180738_wiki_pages_delete.yml           | 10 +++++---
 ...0216180740_design_management_designs_create.yml | 12 +++++----
 ...0216180741_design_management_designs_update.yml | 12 +++++----
 ...0216180743_design_management_designs_delete.yml | 12 +++++----
 .../metrics/counts_all/20210216180750_groups.yml   |  5 ++--
 config/metrics/counts_all/20210216180752_keys.yml  | 10 +++++---
 .../metrics/counts_all/20210216180756_groups.yml   | 14 ++++++-----
 .../counts_all/20210216180758_users_created.yml    | 12 +++++----
 .../counts_all/20210216180800_ldap_keys.yml        | 16 ------------
 .../counts_all/20210216180801_ldap_users.yml       | 16 ------------
 .../counts_all/20210216181009_lfs_objects.yml      |  4 +--
 .../20210216181011_projects_with_packages.yml      | 11 ++++----
 .../metrics/counts_all/20210216181012_packages.yml | 10 +++++---
 ...14_projects_with_expiration_policy_disabled.yml |  8 +++---
 ...016_projects_with_expiration_policy_enabled.yml |  8 +++---
 ...iration_policy_enabled_with_keep_n_set_to_1.yml | 18 ++++++++++++++
 ...iration_policy_enabled_with_keep_n_set_to_5.yml | 18 ++++++++++++++
 ...ration_policy_enabled_with_keep_n_set_to_10.yml | 18 ++++++++++++++
 ...ration_policy_enabled_with_keep_n_set_to_25.yml | 18 ++++++++++++++
 ...ration_policy_enabled_with_keep_n_set_to_50.yml | 18 ++++++++++++++
 ...ation_policy_enabled_with_keep_n_set_to_100.yml | 18 ++++++++++++++
 ...ation_policy_enabled_with_cadence_set_to_1d.yml |  8 +++---
 ...ation_policy_enabled_with_cadence_set_to_7d.yml |  8 +++---
 ...tion_policy_enabled_with_cadence_set_to_14d.yml |  8 +++---
 ...n_policy_enabled_with_cadence_set_to_1month.yml |  8 +++---
 ...n_policy_enabled_with_cadence_set_to_3month.yml |  8 +++---
 ...on_policy_enabled_with_older_than_set_to_7d.yml |  8 +++---
 ...n_policy_enabled_with_older_than_set_to_14d.yml |  8 +++---
 ...n_policy_enabled_with_older_than_set_to_30d.yml |  8 +++---
 ...n_policy_enabled_with_older_than_set_to_90d.yml |  8 +++---
 ...expiration_policy_enabled_with_keep_n_unset.yml | 18 ++++++++++++++
 ...ration_policy_enabled_with_older_than_unset.yml |  8 +++---
 .../metrics/counts_all/20210216181051_vendor.yml   | 11 ++++----
 .../20210216181055_projects_with_packages.yml      | 10 +++++---
 .../20210216181259_jira_imports_projects_count.yml |  2 +-
 .../20210216182547_projects_datadog_active.yml     | 14 ++++++-----
 .../20210216182549_groups_datadog_active.yml       | 14 ++++++-----
 .../20210216182551_templates_datadog_active.yml    | 14 ++++++-----
 .../20210216182553_instances_datadog_active.yml    | 14 ++++++-----
 ...16182555_projects_inheriting_datadog_active.yml | 14 ++++++-----
 ...0216182557_groups_inheriting_datadog_active.yml | 14 ++++++-----
 .../20210216182614_projects_ewm_active.yml         | 14 ++++++-----
 .../20210216182616_groups_ewm_active.yml           | 14 ++++++-----
 .../20210216182618_templates_ewm_active.yml        | 14 ++++++-----
 .../20210216182620_instances_ewm_active.yml        | 14 ++++++-----
 ...210216182622_projects_inheriting_ewm_active.yml | 14 ++++++-----
 ...20210216182623_groups_inheriting_ewm_active.yml | 14 ++++++-----
 .../20210216182722_projects_mock_ci_active.yml     | 17 +++++++------
 .../20210216182724_groups_mock_ci_active.yml       | 17 +++++++------
 .../20210216182726_templates_mock_ci_active.yml    | 17 +++++++------
 .../20210216182728_instances_mock_ci_active.yml    | 17 +++++++------
 ...16182730_projects_inheriting_mock_ci_active.yml | 17 +++++++------
 ...0216182732_groups_inheriting_mock_ci_active.yml | 17 +++++++------
 ...10216182734_projects_mock_monitoring_active.yml | 17 +++++++------
 ...0210216182736_groups_mock_monitoring_active.yml | 17 +++++++------
 ...0216182738_templates_mock_monitoring_active.yml | 17 +++++++------
 ...0216182739_instances_mock_monitoring_active.yml | 17 +++++++------
 ..._projects_inheriting_mock_monitoring_active.yml | 17 +++++++------
 ...43_groups_inheriting_mock_monitoring_active.yml | 17 +++++++------
 ...ge_events_i_package_composer_delete_package.yml | 16 ++++++------
 ...kage_events_i_package_composer_pull_package.yml | 16 ++++++------
 ...kage_events_i_package_composer_push_package.yml | 16 ++++++------
 ...ckage_events_i_package_conan_delete_package.yml | 16 ++++++------
 ...package_events_i_package_conan_pull_package.yml | 16 ++++++------
 ...package_events_i_package_conan_push_package.yml | 16 ++++++------
 ...e_events_i_package_container_delete_package.yml | 18 ++++++++------
 ...age_events_i_package_container_pull_package.yml | 18 ++++++++------
 ...age_events_i_package_container_push_package.yml | 18 ++++++++------
 ...kage_events_i_package_debian_delete_package.yml | 16 ++++++------
 ...ackage_events_i_package_debian_pull_package.yml | 16 ++++++------
 ...ackage_events_i_package_debian_push_package.yml | 18 ++++++++------
 ...919_package_events_i_package_delete_package.yml | 16 ++++++------
 ...ts_i_package_delete_package_by_deploy_token.yml | 16 ++++++------
 ...ge_events_i_package_delete_package_by_guest.yml | 16 ++++++------
 ...age_events_i_package_delete_package_by_user.yml | 16 ++++++------
 ...age_events_i_package_generic_delete_package.yml | 16 ++++++------
 ...ckage_events_i_package_generic_pull_package.yml | 16 ++++++------
 ...ckage_events_i_package_generic_push_package.yml | 16 ++++++------
 ...kage_events_i_package_golang_delete_package.yml | 16 ++++++------
 ...ackage_events_i_package_golang_pull_package.yml | 16 ++++++------
 ...ackage_events_i_package_golang_push_package.yml | 16 ++++++------
 ...ckage_events_i_package_maven_delete_package.yml | 16 ++++++------
 ...package_events_i_package_maven_pull_package.yml | 16 ++++++------
 ...package_events_i_package_maven_push_package.yml | 16 ++++++------
 ...package_events_i_package_npm_delete_package.yml | 16 ++++++------
 ...6_package_events_i_package_npm_pull_package.yml | 16 ++++++------
 ...8_package_events_i_package_npm_push_package.yml | 16 ++++++------
 ...ckage_events_i_package_nuget_delete_package.yml | 16 ++++++------
 ...package_events_i_package_nuget_pull_package.yml | 16 ++++++------
 ...package_events_i_package_nuget_push_package.yml | 16 ++++++------
 ...82956_package_events_i_package_pull_package.yml | 16 ++++++------
 ...ents_i_package_pull_package_by_deploy_token.yml | 16 ++++++------
 ...kage_events_i_package_pull_package_by_guest.yml | 16 ++++++------
 ...ckage_events_i_package_pull_package_by_user.yml | 16 ++++++------
 ...83004_package_events_i_package_push_package.yml | 16 ++++++------
 ...ents_i_package_push_package_by_deploy_token.yml | 16 ++++++------
 ...kage_events_i_package_push_package_by_guest.yml | 16 ++++++------
 ...ckage_events_i_package_push_package_by_user.yml | 16 ++++++------
 ...ackage_events_i_package_pypi_delete_package.yml | 16 ++++++------
 ..._package_events_i_package_pypi_pull_package.yml | 16 ++++++------
 ..._package_events_i_package_pypi_push_package.yml | 16 ++++++------
 ...package_events_i_package_tag_delete_package.yml | 18 ++++++++------
 ...9_package_events_i_package_tag_pull_package.yml | 18 ++++++++------
 ...1_package_events_i_package_tag_push_package.yml | 18 ++++++++------
 .../20210216183400_omniauth_providers.yml          | 15 +++++------
 .../counts_all/20210216183402_two-factor.yml       | 15 +++++------
 .../20210216183404_two-factor-via-u2f-device.yml   | 15 +++++------
 ...210216183406_two-factor-via-webauthn-device.yml | 15 +++++------
 .../metrics/counts_all/20210216183408_standard.yml | 15 +++++------
 .../counts_all/20210216183410_google_oauth2.yml    | 15 +++++------
 ...s_i_package_terraform_module_delete_package.yml |  2 +-
 ...nts_i_package_terraform_module_pull_package.yml |  2 +-
 ...nts_i_package_terraform_module_push_package.yml |  2 +-
 ...20210423005644_i_analytics_dev_ops_adoption.yml |  2 +-
 ...0210427212450_geo_secondary_web_oauth_users.yml |  2 +-
 ...ers_viewing_analytics_group_devops_adoption.yml |  2 +-
 ...10502045402_ci_runners_instance_type_active.yml |  4 +--
 ...20210502050341_ci_runners_group_type_active.yml |  4 +--
 ...210502050834_ci_runners_project_type_active.yml |  4 +--
 .../20210502050942_ci_runners_online.yml           |  4 +--
 ...1651_ci_runners_instance_type_active_online.yml |  4 +--
 ...2051922_ci_runners_group_type_active_online.yml |  4 +--
 ...52036_ci_runners_project_type_active_online.yml |  4 +--
 ...37_in_product_marketing_email_create_0_sent.yml |  2 +-
 ...roduct_marketing_email_create_0_cta_clicked.yml |  2 +-
 ...48_in_product_marketing_email_create_1_sent.yml |  2 +-
 ...roduct_marketing_email_create_1_cta_clicked.yml |  2 +-
 ...04_in_product_marketing_email_create_2_sent.yml |  2 +-
 ...roduct_marketing_email_create_2_cta_clicked.yml |  2 +-
 ...07_in_product_marketing_email_verify_0_sent.yml |  2 +-
 ...roduct_marketing_email_verify_0_cta_clicked.yml |  2 +-
 ...55_in_product_marketing_email_verify_1_sent.yml |  2 +-
 ...roduct_marketing_email_verify_1_cta_clicked.yml |  2 +-
 ...15_in_product_marketing_email_verify_2_sent.yml |  2 +-
 ...roduct_marketing_email_verify_2_cta_clicked.yml |  2 +-
 ...035_in_product_marketing_email_trial_0_sent.yml |  2 +-
 ...product_marketing_email_trial_0_cta_clicked.yml |  2 +-
 ...054_in_product_marketing_email_trial_1_sent.yml |  2 +-
 ...product_marketing_email_trial_1_cta_clicked.yml |  2 +-
 ...114_in_product_marketing_email_trial_2_sent.yml |  2 +-
 ...product_marketing_email_trial_2_cta_clicked.yml |  2 +-
 ...3134_in_product_marketing_email_team_0_sent.yml |  2 +-
 ..._product_marketing_email_team_0_cta_clicked.yml |  2 +-
 ...3153_in_product_marketing_email_team_1_sent.yml |  2 +-
 ..._product_marketing_email_team_1_cta_clicked.yml |  2 +-
 ...3213_in_product_marketing_email_team_2_sent.yml |  2 +-
 ..._product_marketing_email_team_2_cta_clicked.yml |  2 +-
 .../20210514141520_project_imports_total.yml       | 20 +++++++++++++++
 ..._package_events_i_package_helm_pull_package.yml | 20 +++++++++++++++
 ...n_product_marketing_email_experience_0_sent.yml | 21 ++++++++++++++++
 config/metrics/license/20210204124827_hostname.yml |  1 -
 .../license/20210204124829_active_user_count.yml   |  4 +--
 .../20210204124854_license_management_jobs.yml     | 17 -------------
 .../20210204124926_license_trial_ends_on.yml       | 16 ------------
 config/metrics/license/20210216181053_version.yml  |  8 +++---
 config/metrics/license/20210216183237_version.yml  | 12 +++++----
 .../metrics/objects_schemas/topology_schema.json   |  2 +-
 config/metrics/schema.json                         | 29 ++++++++++++++++++----
 .../20210204124858_container_registry_enabled.yml  | 14 ++++++-----
 .../20210204124900_dependency_proxy_enabled.yml    | 14 ++++++-----
 .../settings/20210204124904_gravatar_enabled.yml   | 13 ++++++----
 .../settings/20210204124908_mattermost_enabled.yml | 12 +++++----
 .../settings/20210204124912_prometheus_enabled.yml |  4 ++-
 .../20210204124914_prometheus_metrics_enabled.yml  |  4 ++-
 .../20210204124916_reply_by_email_enabled.yml      | 14 ++++++-----
 ...04124920_web_ide_clientside_preview_enabled.yml | 14 ++++++-----
 .../20210216175459_ingress_modsecurity_enabled.yml |  3 ++-
 .../settings/20210216180314_gitpod_enabled.yml     |  5 ++--
 config/metrics/settings/20210216180836_enabled.yml |  3 +--
 config/metrics/settings/20210216180838_enabled.yml |  3 +--
 .../settings/20210216180840_direct_upload.yml      |  3 +--
 .../settings/20210216180841_background_upload.yml  |  3 +--
 .../metrics/settings/20210216180843_provider.yml   |  5 ++--
 config/metrics/settings/20210216180845_enabled.yml |  3 +--
 config/metrics/settings/20210216180847_enabled.yml |  3 +--
 .../settings/20210216180849_direct_upload.yml      |  3 +--
 .../settings/20210216180851_background_upload.yml  |  3 +--
 .../metrics/settings/20210216180852_provider.yml   |  5 ++--
 config/metrics/settings/20210216180854_enabled.yml |  3 +--
 config/metrics/settings/20210216180856_enabled.yml |  3 +--
 .../settings/20210216180858_direct_upload.yml      |  3 +--
 .../settings/20210216180900_background_upload.yml  |  3 +--
 .../metrics/settings/20210216180902_provider.yml   |  5 ++--
 config/metrics/settings/20210216180903_enabled.yml |  5 ++--
 config/metrics/settings/20210216180905_enabled.yml |  3 +--
 .../settings/20210216180907_direct_upload.yml      |  3 +--
 .../settings/20210216180909_background_upload.yml  |  3 +--
 .../metrics/settings/20210216180911_provider.yml   |  5 ++--
 config/metrics/settings/20210216180913_enabled.yml |  3 +--
 config/metrics/settings/20210216180915_enabled.yml |  3 +--
 .../settings/20210216180916_direct_upload.yml      |  3 +--
 .../settings/20210216180918_background_upload.yml  |  3 +--
 .../metrics/settings/20210216180920_provider.yml   |  5 ++--
 .../settings/20210321224827_gitaly_apdex.yml       |  2 +-
 633 files changed, 2755 insertions(+), 1814 deletions(-)
 delete mode 100644 config/metrics/counts_28d/20210216180820_ldap_keys.yml
 delete mode 100644 config/metrics/counts_28d/20210216180822_ldap_users.yml
 delete mode 100644 config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml
 delete mode 100644 config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
 delete mode 100644 config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
 create mode 100644 config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
 create mode 100644 config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
 create mode 100644 config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
 create mode 100644 config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
 create mode 100644 config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
 create mode 100644 config/metrics/counts_28d/20210520111133_total.yml
 create mode 100644 config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
 create mode 100644 config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
 create mode 100644 config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
 delete mode 100644 config/metrics/counts_all/20210216174826_ldap_users.yml
 delete mode 100644 config/metrics/counts_all/20210216175028_requirements_created.yml
 delete mode 100644 config/metrics/counts_all/20210216175848_projects_github_active.yml
 delete mode 100644 config/metrics/counts_all/20210216175850_groups_github_active.yml
 delete mode 100644 config/metrics/counts_all/20210216175851_templates_github_active.yml
 delete mode 100644 config/metrics/counts_all/20210216175853_instances_github_active.yml
 delete mode 100644 config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml
 delete mode 100644 config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml
 delete mode 100644 config/metrics/counts_all/20210216180800_ldap_keys.yml
 delete mode 100644 config/metrics/counts_all/20210216180801_ldap_users.yml
 create mode 100644 config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
 create mode 100644 config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
 create mode 100644 config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
 create mode 100644 config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
 create mode 100644 config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
 create mode 100644 config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
 create mode 100644 config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
 create mode 100644 config/metrics/counts_all/20210514141520_project_imports_total.yml
 create mode 100644 config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
 create mode 100644 config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
 delete mode 100644 config/metrics/license/20210204124854_license_management_jobs.yml
 delete mode 100644 config/metrics/license/20210204124926_license_trial_ends_on.yml

(limited to 'config/metrics')

diff --git a/config/metrics/aggregates/code_review.yml b/config/metrics/aggregates/code_review.yml
index e1f30777612..c002bd88b7d 100644
--- a/config/metrics/aggregates/code_review.yml
+++ b/config/metrics/aggregates/code_review.yml
@@ -52,6 +52,7 @@
     - 'i_code_review_user_reviewers_changed'
     - 'i_code_review_user_milestone_changed'
     - 'i_code_review_user_labels_changed'
+    - 'i_code_review_click_diff_view_setting'
     - 'i_code_review_click_single_file_mode_setting'
     - 'i_code_review_click_file_browser_setting'
     - 'i_code_review_click_whitespace_setting'
@@ -63,6 +64,8 @@
     - 'i_code_review_diff_hide_whitespace'
     - 'i_code_review_diff_single_file'
     - 'i_code_review_diff_multiple_files'
+    - 'i_code_review_user_load_conflict_ui'
+    - 'i_code_review_user_resolve_conflict'
 - name: code_review_category_monthly_active_users
   operator: OR
   feature_flag: usage_data_code_review_aggregation
@@ -107,6 +110,7 @@
     - 'i_code_review_user_reviewers_changed'
     - 'i_code_review_user_milestone_changed'
     - 'i_code_review_user_labels_changed'
+    - 'i_code_review_click_diff_view_setting'
     - 'i_code_review_click_single_file_mode_setting'
     - 'i_code_review_click_file_browser_setting'
     - 'i_code_review_click_whitespace_setting'
@@ -118,6 +122,8 @@
     - 'i_code_review_diff_hide_whitespace'
     - 'i_code_review_diff_single_file'
     - 'i_code_review_diff_multiple_files'
+    - 'i_code_review_user_load_conflict_ui'
+    - 'i_code_review_user_resolve_conflict'
 - name: code_review_extension_category_monthly_active_users
   operator: OR
   feature_flag: usage_data_code_review_aggregation
diff --git a/config/metrics/counts_28d/20210216175542_ci_builds.yml b/config/metrics/counts_28d/20210216175542_ci_builds.yml
index 0f3d384937c..b14eda69786 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -3,7 +3,7 @@ key_path: usage_activity_by_stage_monthly.verify.ci_builds
 description: Unique monthly builds in project
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
index bc0a2051097..d2cda411e05 100644
--- a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
@@ -3,7 +3,7 @@ key_path: usage_activity_by_stage_monthly.verify.ci_external_pipelines
 description: Total pipelines in external repositories in a month
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-
diff --git a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
index d04419aebfc..8046f9f3fd0 100644
--- a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
@@ -3,7 +3,7 @@ key_path: usage_activity_by_stage_monthly.verify.ci_internal_pipelines
 description: Total pipelines in GitLab repositories in a month
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
index c89d4804607..a24e8038a62 100644
--- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
@@ -3,7 +3,7 @@ key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_config_repository
 description: Total Monthly Pipelines from templates in repository
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
index cfea6f49eb5..7a878a5ac1e 100644
--- a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
@@ -3,7 +3,7 @@ key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_schedules
 description: Total monthly Pipeline schedules in GitLab
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
index 55b0250bbbd..19276843af1 100644
--- a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
@@ -3,7 +3,7 @@ key_path: usage_activity_by_stage_monthly.verify.ci_pipelines
 description:  "Distinct users triggering pipelines in a month"
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216175556_ci_triggers.yml b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
index 7a06e45b4e4..81be64c5207 100644
--- a/config/metrics/counts_28d/20210216175556_ci_triggers.yml
+++ b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
@@ -3,7 +3,7 @@ key_path: usage_activity_by_stage_monthly.verify.ci_triggers
 description: Total configured Triggers in project
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216180308_personal_snippets.yml b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
index 691907be1d6..f38ccc5280d 100644
--- a/config/metrics/counts_28d/20210216180308_personal_snippets.yml
+++ b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts_monthly.personal_snippets
-description: Monthly count of Personal Snippets
+description: Monthly count of personal Snippets
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180310_project_snippets.yml b/config/metrics/counts_28d/20210216180310_project_snippets.yml
index 5703fb29678..2c397a3150e 100644
--- a/config/metrics/counts_28d/20210216180310_project_snippets.yml
+++ b/config/metrics/counts_28d/20210216180310_project_snippets.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts_monthly.project_snippets
-description: Monthly count of Project Snippets
+description: Monthly count of project Snippets
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180312_snippets.yml b/config/metrics/counts_28d/20210216180312_snippets.yml
index b132575dad7..00498c8ad0a 100644
--- a/config/metrics/counts_28d/20210216180312_snippets.yml
+++ b/config/metrics/counts_28d/20210216180312_snippets.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180317_snippets.yml b/config/metrics/counts_28d/20210216180317_snippets.yml
index fc2ba339313..0e36236b80d 100644
--- a/config/metrics/counts_28d/20210216180317_snippets.yml
+++ b/config/metrics/counts_28d/20210216180317_snippets.yml
@@ -1,6 +1,7 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.snippets
-description: Monthly Snippets
+name: count_distinct_author_id_from_snippets
+description: Count of distinct author_id from snippets for last 28 days 
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -8,7 +9,7 @@ product_category: snippets
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -16,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
index 3a7b7f71051..3143da2317f 100644
--- a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_web_ide_edit
-description: Count unique edit actions using the web IDE
+description: Number of users editing using web IDE 
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -8,9 +8,11 @@ product_category: web_ide
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
index 6a0fd1da84c..b9a06a05a5a 100644
--- a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
+++ b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_sfe_edit
-description: Count unique edit actions using the single file editor
+description: Number of users using single file editor
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -8,9 +8,11 @@ product_category: web_ide
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
index 11ab783f52a..6fec0659d47 100644
--- a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
+++ b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_snippet_editor_edit
-description: Count unique edit actions using the snippet editor
+description: Number of users using the snippet editor
 product_section: dev
 product_stage: create
 product_group: group::editor
-product_category: web_ide
+product_category: snippets
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
index 3d7c3cb4066..86cb28d7237 100644
--- a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
+++ b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_sse_edit
-description: Count unique edit actions using the static site editor
+description: Number of users using the static site editor
 product_section: dev
 product_stage: create
 product_group: group::editor
-product_category: web_ide
+product_category: static_site_editor
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
index e31bf71d455..bf71c3aa9f0 100644
--- a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_ide_edit
-description: Count unique edit actions when users used an IDE, no matter which one
+description: Number of unique users per month who edited a file from any web editor
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -8,9 +8,11 @@ product_category: web_ide
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
index f94ff9f026e..50ad1360d8d 100644
--- a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ide_edit.g_edit_by_web_ide_monthly
-description:
+description: Number of users editing a file from the Web IDE
 product_section: dev
 product_stage: create
 product_group: group::editor
-product_category:
+product_category: web_ide
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
index fca08b9f093..8c53d1a39c0 100644
--- a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
+++ b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ide_edit.g_edit_by_sfe_monthly
-description:
+description: Number of users editing a file from the single file editor
 product_section: dev
 product_stage: create
 product_group: group::editor
-product_category:
+product_category: web_ide
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
index 2cad76aa04c..d9735e35895 100644
--- a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ide_edit.g_edit_by_snippet_ide_monthly
-description:
+description: Count of monthly edits to a snippet
 product_section: dev
 product_stage: create
 product_group: group::editor
-product_category:
+product_category: snippets
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
index aba5f8bc39a..176f0e3ffe1 100644
--- a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ide_edit.ide_edit_total_unique_counts_monthly
-description:
+description: Count of unique users per month who edited a file from the Web IDE
 product_section: dev
 product_stage: create
 product_group: group::editor
-product_category:
+product_category: web_ide
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
index e4af1478c64..15bf70a3adf 100644
--- a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
+++ b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_design_management
-description:
+description: Monthly active users for design management
 product_section: dev
-product_stage: create
-product_group: group::knowledge
+product_stage: plan
+product_group: group::product planning
 product_category: design_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
index 125c1de4714..a513a18d1b5 100644
--- a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
+++ b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_wiki_repo
-description:
+description: Unique monthly active users of the Wiki
 product_section: dev
 product_stage: create
-product_group: group::knowledge
+product_group: group::editor
 product_category: wiki
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216180816_groups.yml b/config/metrics/counts_28d/20210216180816_groups.yml
index 90723ed78ab..61cf815eae7 100644
--- a/config/metrics/counts_28d/20210216180816_groups.yml
+++ b/config/metrics/counts_28d/20210216180816_groups.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.groups
-description:
+description: Number of users who are group members for last 28 days
 product_section: dev
-product_stage:
-product_group: group::manage
-product_category:
+product_stage: manage
+product_group: group::access
+product_category: subgroups
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216180818_users_created.yml b/config/metrics/counts_28d/20210216180818_users_created.yml
index 81ed776a3c4..b0212fb3d01 100644
--- a/config/metrics/counts_28d/20210216180818_users_created.yml
+++ b/config/metrics/counts_28d/20210216180818_users_created.yml
@@ -2,16 +2,17 @@
 key_path: usage_activity_by_stage_monthly.manage.users_created
 description: Number of users created in the month
 product_section: dev
-product_stage:
-product_group: group::manage
-product_category:
+product_stage: manage
+product_group: group::access
+product_category: users
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216180820_ldap_keys.yml b/config/metrics/counts_28d/20210216180820_ldap_keys.yml
deleted file mode 100644
index 0f64752fe96..00000000000
--- a/config/metrics/counts_28d/20210216180820_ldap_keys.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.manage.ldap_keys
-description:
-product_section: dev
-product_stage:
-product_group: group::manage
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180822_ldap_users.yml b/config/metrics/counts_28d/20210216180822_ldap_users.yml
deleted file mode 100644
index 6145b32959f..00000000000
--- a/config/metrics/counts_28d/20210216180822_ldap_users.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.manage.ldap_users
-description:
-product_section: dev
-product_stage:
-product_group: group::manage
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
index b3a4a9e384d..116e7c1c816 100644
--- a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
@@ -6,7 +6,8 @@ product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '14.0'
 time_frame: 28d
 data_source: database
 distribution:
diff --git a/config/metrics/counts_28d/20210216181050_packages.yml b/config/metrics/counts_28d/20210216181050_packages.yml
index 4c6edc118aa..f364a4778e0 100644
--- a/config/metrics/counts_28d/20210216181050_packages.yml
+++ b/config/metrics/counts_28d/20210216181050_packages.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts_monthly.packages
-description: Monthly count of Packages
+description: A monthly count of packages published to the registry
 product_section: ops
-product_stage:
+product_stage: package
 product_group: group::package
-product_category:
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
index 3fe9c7fde65..5460afbc134 100644
--- a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
+++ b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.package.projects_with_packages
-description: Incident confidential status changed event
+description: The total number of projects in a given month with at least one package
 product_section: ops
 product_stage: package
 product_group: group::package
-product_category:
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
index e828cefc644..77ae29b729a 100644
--- a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
+++ b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
@@ -9,7 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
-instrumentation_class: CountUsersUsingApproveQuickActionMetric
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_approve
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
index 74f20cbe5c4..fe7f0a33d9b 100644
--- a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
+++ b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
@@ -1,16 +1,17 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.omniauth_providers
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of unique user logins using an OmniAuth provider
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183629_two-factor.yml b/config/metrics/counts_28d/20210216183629_two-factor.yml
index 3b15b3e0eb7..273589b53a2 100644
--- a/config/metrics/counts_28d/20210216183629_two-factor.yml
+++ b/config/metrics/counts_28d/20210216183629_two-factor.yml
@@ -1,16 +1,17 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of unique user logins using two factor authentication
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml b/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
index 08cbb3437d1..05b8c96646d 100644
--- a/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
+++ b/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
@@ -1,16 +1,17 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor-via-u2f-device
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of unique user logins using two factor via a U2F device
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml b/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
index 1a9251bcf16..a386ae4fea4 100644
--- a/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
+++ b/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
@@ -1,16 +1,17 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor-via-webauthn-device
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of unique user logins using two factor via a WebAuthn device
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183634_standard.yml b/config/metrics/counts_28d/20210216183634_standard.yml
index 8afb1b2321b..12f33070c85 100644
--- a/config/metrics/counts_28d/20210216183634_standard.yml
+++ b/config/metrics/counts_28d/20210216183634_standard.yml
@@ -1,16 +1,17 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.standard
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of unique user logins using password authentication
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183636_google_oauth2.yml b/config/metrics/counts_28d/20210216183636_google_oauth2.yml
index 1ee1a70aaac..e7cbc3718bb 100644
--- a/config/metrics/counts_28d/20210216183636_google_oauth2.yml
+++ b/config/metrics/counts_28d/20210216183636_google_oauth2.yml
@@ -1,16 +1,17 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.google_oauth2
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of unique user logins using Google OAuth authentication
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
index 6651dfa0146..670b8d555d8 100644
--- a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
+++ b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.unique_users_all_imports
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
+description: Number of users from projects imported
+product_section: dev
+product_stage: manage
+product_group: group::import
 product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183644_gitlab_project.yml b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
index 166be23baac..03c2d993a6c 100644
--- a/config/metrics/counts_28d/20210216183644_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab_project
 description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
+product_section: dev
+product_stage: manage
+product_group: group::import
 product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183646_gitlab.yml b/config/metrics/counts_28d/20210216183646_gitlab.yml
index 25bb788cc4f..a3e1f9d35b0 100644
--- a/config/metrics/counts_28d/20210216183646_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183646_gitlab.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
+description: Count of projects imported from GitLab using Project Export/Import
+product_section: dev
+product_stage: manage
+product_group: group::import
 product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183648_github.yml b/config/metrics/counts_28d/20210216183648_github.yml
index 6f79b49a37f..124ae696d68 100644
--- a/config/metrics/counts_28d/20210216183648_github.yml
+++ b/config/metrics/counts_28d/20210216183648_github.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.project_imports.github
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects imported from GitHub
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category:
 value_type: number
 status: data_available
-time_frame: 28d
-data_source:
+time_frame: all
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183650_bitbucket.yml b/config/metrics/counts_28d/20210216183650_bitbucket.yml
index fc31e325278..9d8b9374e3f 100644
--- a/config/metrics/counts_28d/20210216183650_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183650_bitbucket.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.project_imports.bitbucket
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects imported from Bitbucket
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category:
 value_type: number
 status: data_available
-time_frame: 28d
-data_source:
+time_frame: all
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
index fd0b64933b1..e84adc3aba8 100644
--- a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.project_imports.bitbucket_server
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects imported from Bitbucket Server
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category:
 value_type: number
 status: data_available
-time_frame: 28d
-data_source:
+time_frame: all
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183653_gitea.yml b/config/metrics/counts_28d/20210216183653_gitea.yml
index a09fdc9d610..46087d194da 100644
--- a/config/metrics/counts_28d/20210216183653_gitea.yml
+++ b/config/metrics/counts_28d/20210216183653_gitea.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.project_imports.gitea
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects imported from Gitea
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183655_git.yml b/config/metrics/counts_28d/20210216183655_git.yml
index b17900f534d..e0f3a1da4e1 100644
--- a/config/metrics/counts_28d/20210216183655_git.yml
+++ b/config/metrics/counts_28d/20210216183655_git.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.project_imports.git
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
+description: Count of projects imported from Git
+product_section: dev
+product_stage: manage
+product_group: group::import
 product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183657_manifest.yml b/config/metrics/counts_28d/20210216183657_manifest.yml
index 49fcefb3a45..3bc9b639a59 100644
--- a/config/metrics/counts_28d/20210216183657_manifest.yml
+++ b/config/metrics/counts_28d/20210216183657_manifest.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.project_imports.manifest
 description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
+product_section: dev
+product_stage: manage
+product_group: group::import
 product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
index 700fe4b4881..1304ea7b166 100644
--- a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab_migration
 description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
+product_section: dev
+product_stage: manage
+product_group: group::import
 product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183709_group_import.yml b/config/metrics/counts_28d/20210216183709_group_import.yml
index 9116a242811..eca3eada4d4 100644
--- a/config/metrics/counts_28d/20210216183709_group_import.yml
+++ b/config/metrics/counts_28d/20210216183709_group_import.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.group_imports.group_import
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
+description: Number of group import states
+product_section: dev
+product_stage: manage
+product_group: group::import
 product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210216183720_bitbucket.yml b/config/metrics/counts_28d/20210216183720_bitbucket.yml
index e05c607f202..b3b34c95800 100644
--- a/config/metrics/counts_28d/20210216183720_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183720_bitbucket.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.bitbucket
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects imported from Bitbucket
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category:
 value_type: number
 status: deprecated
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
index c7f2a18f1b1..1a8ace962e0 100644
--- a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.bitbucket_server
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
+description: Count of projects imported from Bitbucket Server
+product_section: dev
+product_stage: manage
+product_group: group::import
 product_category: ''
 value_type: number
 status: deprecated
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183737_groups_imported.yml b/config/metrics/counts_28d/20210216183737_groups_imported.yml
index 3b668e6cac6..10ffa325a11 100644
--- a/config/metrics/counts_28d/20210216183737_groups_imported.yml
+++ b/config/metrics/counts_28d/20210216183737_groups_imported.yml
@@ -1,9 +1,9 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.groups_imported
 description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
+product_section: dev
+product_stage: manage
+product_group: group::import
 product_category: ''
 value_type: number
 status: deprecated
diff --git a/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml b/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml
deleted file mode 100644
index f4eb1e39947..00000000000
--- a/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage_monthly.secure.dependency_scanning_scans
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
index ee06f117ff8..77ba0847a62 100644
--- a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
+++ b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ide_edit.g_edit_by_sse_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of user editing files using the Static Site Editor
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category: static_site_editor
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
index e9d67155907..53590df359c 100644
--- a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
+++ b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.snippets.i_snippets_show_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Monthly number of users viewing snippets
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category: snippets
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
index b649192d659..8e8f8b9b65b 100644
--- a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
+++ b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Monthly unique user count doing commits which contains the CI config file
+product_section: ops
+product_stage: verify
+product_group: group::pipeline authoring
+product_category: pipeline_authoring
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
index 541d619a6e7..1dcc98ad975 100644
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
@@ -1,16 +1,20 @@
 ---
 key_path: redis_hll_counters.ci_templates.ci_templates_total_unique_counts_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Total count of pipelines runs
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
-status: data_available
+status: broken
+repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332466
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+
diff --git a/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
index 5d25977e938..7f2f93f909b 100644
--- a/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.deploy_token_packages.i_package_composer_deploy_token_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of Composer packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
index 5f86c64cda6..6a2bd47f725 100644
--- a/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.deploy_token_packages.i_package_conan_deploy_token_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of Conan packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
index 6ba5297d60d..4bb6038634f 100644
--- a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.deploy_token_packages.i_package_container_deploy_token_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of container images published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: container registry
 value_type: number
-status: data_available
+status: deprecated
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
index 9fe96b21e7e..1bf0aa9697d 100644
--- a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.deploy_token_packages.i_package_debian_deploy_token_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of Debian packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
-status: data_available
+status: deprecated
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
index 982d765b5fa..cc4754964dd 100644
--- a/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
@@ -1,16 +1,19 @@
 ---
 key_path: redis_hll_counters.deploy_token_packages.i_package_generic_deploy_token_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of generic packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
-status: data_available
+status: broken
+repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331455
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
index b5001143b05..3b4f45e0737 100644
--- a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.deploy_token_packages.i_package_golang_deploy_token_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of Go modules published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
-status: data_available
+status: deprecated
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
index 220fa24696b..eabb8cff15f 100644
--- a/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.deploy_token_packages.i_package_maven_deploy_token_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of Maven packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
index ba98e8363a0..fc3b6db7af8 100644
--- a/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.deploy_token_packages.i_package_npm_deploy_token_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of npm packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
index 2fe6251f959..6dfb7a6a201 100644
--- a/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.deploy_token_packages.i_package_nuget_deploy_token_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of NuGet packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
index db8b894abf7..9a73f02c128 100644
--- a/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
@@ -1,16 +1,19 @@
 ---
 key_path: redis_hll_counters.deploy_token_packages.i_package_pypi_deploy_token_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of PyPI packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+
diff --git a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
index b69c4aa13d5..6a9856418c4 100644
--- a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.deploy_token_packages.i_package_tag_deploy_token_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of package tags published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
-status: data_available
+status: deprecated
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
index b17e2a671b3..9df4ad1d53e 100644
--- a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.deploy_token_packages.deploy_token_packages_total_unique_counts_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml b/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
index 821a30c475f..23cdfbb2be4 100644
--- a/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.user_packages.i_package_composer_user_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of users that have published a Composer package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml b/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
index 34ca1cba1e8..44b005feead 100644
--- a/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.user_packages.i_package_conan_user_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of users that have published a Conan package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
index dd916840cb1..3ff19ed318b 100644
--- a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.user_packages.i_package_container_user_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of users that have published a container image to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: container registry
 value_type: number
-status: data_available
+status: deprecated
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
index d72c6db17bb..84993d1d227 100644
--- a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.user_packages.i_package_debian_user_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of users that have published a Debian package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
-status: data_available
+status: deprecated
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
index af2d01d8320..8365d585d6a 100644
--- a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
@@ -1,16 +1,19 @@
 ---
 key_path: redis_hll_counters.user_packages.i_package_generic_user_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of users that have published a generic package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
-status: data_available
+status: broken
+repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331455
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
index 031a6b51b04..8a8adf299a2 100644
--- a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.user_packages.i_package_golang_user_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of users that have published a Go moduleto the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
-status: data_available
+status: deprecated
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml b/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
index 4a4649cd38a..8f404ea70d3 100644
--- a/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.user_packages.i_package_maven_user_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of users that have published a Maven package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml b/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
index 12dd245e7be..2c81962800a 100644
--- a/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.user_packages.i_package_npm_user_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of users that have published an npm package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml b/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
index 6035e571393..9dcfb653994 100644
--- a/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.user_packages.i_package_nuget_user_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of users that have published a NuGet package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml b/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
index eff9b749fb4..d975d7ed7ac 100644
--- a/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.user_packages.i_package_pypi_user_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of users that have published a PyPI package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
index 15c078db1f9..5e953322470 100644
--- a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.user_packages.i_package_tag_user_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of users that have published a package tag to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
-status: data_available
+status: deprecated
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
index c21e9bebd6c..f01aba36f32 100644
--- a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.user_packages.user_packages_total_unique_counts_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A monthly count of users that have published a package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml b/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
index c5fa7e2dcf7..d5a96845a4d 100644
--- a/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_close_issue_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of users closing Jira issues by month
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml b/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
index f4469c41dd3..81b6bd694c8 100644
--- a/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
+++ b/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_cross_reference_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of users that cross-referenced Jira issues by month
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml b/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
deleted file mode 100644
index dd114b37a99..00000000000
--- a/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_list_issues_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml b/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
deleted file mode 100644
index 04f33c6f333..00000000000
--- a/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_create_issue_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
index 6c1d08964a9..edd25537070 100644
--- a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ecosystem.ecosystem_total_unique_counts_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of users performing actions on Jira issues by month
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml b/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
index 3bd212d751c..38782ce6ce4 100644
--- a/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.deploy_token_packages.i_package_rubygems_deploy_token_monthly
-description: Distinct user count events for RubyGems packages in recent 28 days
+description: Distinct count events for RubyGems packages published using a Deploy token in recent 28 days
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -18,4 +18,3 @@ tier:
 - free
 - premium
 - ultimate
-
diff --git a/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml b/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
index 6f0ffabd23d..3c5f72e525e 100644
--- a/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
+++ b/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.user_packages.i_package_rubygems_user_monthly
-description: Distinct user count events for RubyGems packages in recent 28 days
+description: Distinct user count of RubyGems packages published in recent 28 days
 product_section: ops
 product_stage: package
 product_group: group::package
diff --git a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
index 0d0318a02c6..6699b789178 100644
--- a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
@@ -6,7 +6,7 @@ product_stage: secure
 product_group: group::static analysis
 product_category: dependency_scanning
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
index 00d1249d0f9..7ce8873f4f6 100644
--- a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
@@ -6,7 +6,7 @@ product_stage: verify
 product_group: group::testing
 product_category: code_quality
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
index 2b9136fde62..7669db19d21 100644
--- a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
@@ -6,7 +6,7 @@ product_stage: verify
 product_group: group::testing
 product_category: accessibility_testing
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml b/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
index 00ddefe4901..5a9029b57c1 100644
--- a/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
@@ -6,7 +6,7 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml b/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
index 75accebea99..ab606fdd903 100644
--- a/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
+++ b/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
@@ -6,7 +6,7 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
index a6186d44698..e0d1fe6b1f3 100644
--- a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
+++ b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
@@ -6,7 +6,7 @@ product_stage: verify
 product_group: group::testing
 product_category: testing
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59316
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml b/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
index 2bcd2a448ec..a3d27ec7fd9 100644
--- a/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml b/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
index 3b7c5be9b84..1bacc4d30dc 100644
--- a/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml b/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
index 31fe497fe0e..b9c7d00b8b3 100644
--- a/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml b/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
index 821f7244209..dc7f22008a7 100644
--- a/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
+++ b/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml b/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
index 04ff06143af..a6102f8f936 100644
--- a/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
+++ b/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml b/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
index ad5b5e835c1..e8539fa483b 100644
--- a/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
+++ b/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml b/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
index c71bacd6004..b3b1cb0b54e 100644
--- a/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
+++ b/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml b/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
index 0d17fa0d965..006e345f0f0 100644
--- a/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
+++ b/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml b/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
index 6038bb5cda8..273a98da172 100644
--- a/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
+++ b/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml b/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
index 3cfcdf23a47..17ce7101133 100644
--- a/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
+++ b/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml b/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
index 16784a0c408..cde5800cf60 100644
--- a/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
+++ b/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
index 224fd6477cc..53757c27ca2 100644
--- a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
@@ -7,7 +7,7 @@ product_stage:
 product_group:
 product_category:
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
index ba872d725df..9d79661bf27 100644
--- a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
@@ -7,7 +7,7 @@ product_stage:
 product_group:
 product_category:
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
index e0e6bb0567d..492c50c4838 100644
--- a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
@@ -7,7 +7,7 @@ product_stage:
 product_group:
 product_category:
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
index 594df7ebe26..edd385da9ce 100644
--- a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
@@ -7,7 +7,7 @@ product_stage:
 product_group:
 product_category:
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml b/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml
index 0f68989cc1d..dc08952bb18 100644
--- a/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml
+++ b/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml
@@ -7,7 +7,7 @@ product_stage:
 product_group:
 product_category:
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml b/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
new file mode 100644
index 00000000000..c685e277215
--- /dev/null
+++ b/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
@@ -0,0 +1,21 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_resolve_conflict_monthly
+name: resolve_conflict
+description: Count of unique users per week who attempt to resolve a conflict through the ui
+product_section:
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+milestone: "13.12"
+time_frame: 28d
+data_source: redis_hll
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61654
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml b/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
new file mode 100644
index 00000000000..e421203a195
--- /dev/null
+++ b/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
@@ -0,0 +1,21 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_load_conflict_ui_monthly
+name: load_conflict_ui
+description: Count of unique users per week who load the conflict resolution page
+product_section:
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+milestone: "13.12"
+time_frame: 28d
+data_source: redis_hll
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61654
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
new file mode 100644
index 00000000000..67dd8f83475
--- /dev/null
+++ b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
@@ -0,0 +1,20 @@
+---
+key_path: counts_monthly.projects
+description: 'Count number of projects created monthly'
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: ''
+value_type: number
+status: implemented
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61775
+time_frame: 28d
+data_source: database
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml b/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
new file mode 100644
index 00000000000..7a2b6a882a1
--- /dev/null
+++ b/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.i_package_helm_deploy_token_monthly
+description: Distinct Helm pakages deployed in recent 28 days
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package_registry
+value_type: number
+status: implemented
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61014
+time_frame: 28d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml b/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
new file mode 100644
index 00000000000..ca524c7a500
--- /dev/null
+++ b/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.user_packages.i_package_helm_user_monthly
+description: Distinct user count events for Helm packages in recent 28 days
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package_registry
+value_type: number
+status: implemented
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61014
+time_frame: 28d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210520111133_total.yml b/config/metrics/counts_28d/20210520111133_total.yml
new file mode 100644
index 00000000000..9b4ec4f0909
--- /dev/null
+++ b/config/metrics/counts_28d/20210520111133_total.yml
@@ -0,0 +1,20 @@
+---
+key_path: usage_activity_by_stage_monthly.manage.project_imports.total
+description: Total count of projects imported
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category:
+value_type: number
+status: implemented
+milestone: "14.0"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61775"
+time_frame: 28d
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml b/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
new file mode 100644
index 00000000000..04edbaf1ec1
--- /dev/null
+++ b/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_click_diff_view_setting_monthly
+description: Count of users clicking diff view setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
new file mode 100644
index 00000000000..75c9ec54cff
--- /dev/null
+++ b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.ide_edit.g_edit_by_web_ide_weekly
+description: Weekly number of users editing using the Web IDE
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category: web_ide
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
new file mode 100644
index 00000000000..17a8146bdca
--- /dev/null
+++ b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.ide_edit.g_edit_by_sfe_weekly
+description: Weekly number of users editing from the single file editor
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category: web_ide
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
new file mode 100644
index 00000000000..3ef008c12bb
--- /dev/null
+++ b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.ide_edit.g_edit_by_snippet_ide_weekly
+description: Weekly number of users editing Snippets
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category: snippets
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
new file mode 100644
index 00000000000..60bd21f811a
--- /dev/null
+++ b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.ide_edit.ide_edit_total_unique_counts_weekly
+description: Weekly number of users editing a file using the Web IDE
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category: web_ide
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
index 362404036a5..a8dbfcf2555 100644
--- a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
+++ b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
@@ -9,7 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
-instrumentation_class: CountUsersUsingApproveQuickActionMetric
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_approve
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
new file mode 100644
index 00000000000..3fefa5bdda9
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.ide_edit.g_edit_by_sse_weekly
+description: Weekly number of users editing using the Static Site Editor
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category: static_site_editor
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
new file mode 100644
index 00000000000..d6d28589760
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.snippets.i_snippets_show_weekly
+description: Weekly number of users viewing snippets
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category: snippets
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml b/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
new file mode 100644
index 00000000000..68c75dd579b
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly
+description: Weekly unique user count doing commits which contains the CI config file
+product_section: ops
+product_stage: verify
+product_group: group::pipeline authoring
+product_category: pipeline_authoring
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
new file mode 100644
index 00000000000..6f7c9c18aa1
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.ci_templates.ci_templates_total_unique_counts_weekly
+description: Total count of pipelines runs
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
+value_type: number
+status: broken
+repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332466
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+
diff --git a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
new file mode 100644
index 00000000000..cd92e9282ef
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.i_package_composer_deploy_token_weekly
+description: A weekly count of Composer packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: deprecated
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
new file mode 100644
index 00000000000..e6c21b02342
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.i_package_conan_deploy_token_weekly
+description: A weekly count of Conan packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
new file mode 100644
index 00000000000..3fde3669069
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.i_package_container_deploy_token_weekly
+description: A weekly count of container images published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: container registry
+value_type: number
+status: deprecated
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
new file mode 100644
index 00000000000..7d76be2711b
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.i_package_debian_deploy_token_weekly
+description: A weekly count of Debian packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: deprecated
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
new file mode 100644
index 00000000000..edcd164636a
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.i_package_generic_deploy_token_weekly
+description: A weekly count of generic packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
new file mode 100644
index 00000000000..5c0ec453711
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.i_package_golang_deploy_token_weekly
+description: A weekly count of Go modules published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: deprecated
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
new file mode 100644
index 00000000000..af6daafa7dd
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.i_package_maven_deploy_token_weekly
+description: A weekly count of Maven packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
new file mode 100644
index 00000000000..609bebc4087
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.i_package_npm_deploy_token_weekly
+description: A weekly count of npm packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
new file mode 100644
index 00000000000..0f78eb35621
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.i_package_nuget_deploy_token_weekly
+description: A weekly count of NuGet packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
new file mode 100644
index 00000000000..0cf568469ee
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.i_package_pypi_deploy_token_weekly
+description: A weekly count of Python packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
new file mode 100644
index 00000000000..b36b49e33ae
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.i_package_tag_deploy_token_weekly
+description: A weekly count of users that have published a package tag to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: deprecated
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
new file mode 100644
index 00000000000..3809462ab07
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.deploy_token_packages_total_unique_counts_weekly
+description: A weekly count of packages published to the registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
new file mode 100644
index 00000000000..cfaa46f0dae
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.user_packages.i_package_composer_user_weekly
+description: A weekly count of users that have published a Composer package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
new file mode 100644
index 00000000000..b044acc90fa
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.user_packages.i_package_conan_user_weekly
+description: A weekly count of users that have published a Conan package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
new file mode 100644
index 00000000000..98a07acb5d0
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.user_packages.i_package_container_user_weekly
+description: A weekly count of users that have published a container image to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: container registry
+value_type: number
+status: deprecated
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
new file mode 100644
index 00000000000..8dc2aed0989
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.user_packages.i_package_debian_user_weekly
+description: A weekly count of users that have published a Debian package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: deprecated
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
new file mode 100644
index 00000000000..e5e25e10db1
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.user_packages.i_package_generic_user_weekly
+description: A weekly count of users that have published a generic package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: broken
+repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331455
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
new file mode 100644
index 00000000000..e7c354fdbf6
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.user_packages.i_package_golang_user_weekly
+description: A weekly count of users that have published a Go module to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: deprecated
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
new file mode 100644
index 00000000000..8ee42570d49
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.user_packages.i_package_maven_user_weekly
+description: A weekly count of users that have published a Maven package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
new file mode 100644
index 00000000000..29dd1a69cf0
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.user_packages.i_package_npm_user_weekly
+description: A weekly count of users that have published an npm package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
new file mode 100644
index 00000000000..5a4e18afa15
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.user_packages.i_package_nuget_user_weekly
+description: A weekly count of users that have published a NuGet package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
new file mode 100644
index 00000000000..ebb116c53a6
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.user_packages.i_package_pypi_user_weekly
+description: A weekly count of users that have published a Python package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
new file mode 100644
index 00000000000..02a8c435a35
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.user_packages.i_package_tag_user_weekly
+description: A weekly count of users that have published a package with a tag to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: deprecated
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
new file mode 100644
index 00000000000..f262cb31b68
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.user_packages.user_packages_total_unique_counts_weekly
+description: A weekly count of users that have published a package to the registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
new file mode 100644
index 00000000000..e3a8d4b4b8e
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_close_issue_weekly
+description: Number of users closing Jira issues by week
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
new file mode 100644
index 00000000000..91edf718033
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_cross_reference_weekly
+description: Number of users that cross-referenced Jira issues by week
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
new file mode 100644
index 00000000000..71a7c0ebbf1
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.ecosystem.ecosystem_total_unique_counts_weekly
+description: Number of users performing actions on Jira issues by week
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml b/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
index ec3258babd5..c0bd8b6b224 100644
--- a/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.deploy_token_packages.i_package_rubygems_deploy_token_weekly
-description: Distinct RubyGems pakages deployed in recent 7 days
+description: A weekly count of distinct RubyGems packages published using a deploy token
 product_section: ops
 product_stage: package
 product_group: group::package
diff --git a/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml b/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
index 57d8f3b9457..4935d036846 100644
--- a/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
+++ b/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
@@ -1,6 +1,6 @@
 ---
 key_path: redis_hll_counters.user_packages.i_package_rubygems_user_weekly
-description: Distinct user count events for RubyGems packages in recent 7 days
+description: A weekly count of distinct RubyGems packages published by a user
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -18,4 +18,3 @@ tier:
 - free
 - premium
 - ultimate
-
diff --git a/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
index c510d544426..5516ee24fc3 100644
--- a/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
@@ -6,7 +6,7 @@ product_stage: secure
 product_group: group::static analysis
 product_category: dependency_scanning
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
index 5b714b49bd8..2cca9adda79 100644
--- a/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
@@ -6,7 +6,7 @@ product_stage: verify
 product_group: group::testing
 product_category: code_quality
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
index b8fdf90bb41..05448c69986 100644
--- a/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
@@ -6,7 +6,7 @@ product_stage: verify
 product_group: group::testing
 product_category: accessibility_testing
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
index 7fedcc5f05d..2e97e1fae31 100644
--- a/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
@@ -6,7 +6,7 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
index 49d8ad20126..1e7b666ff8f 100644
--- a/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
+++ b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
@@ -6,7 +6,7 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
index f44347f5159..60dfc6980b7 100644
--- a/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
+++ b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
@@ -6,7 +6,7 @@ product_stage: verify
 product_group: group::testing
 product_category: testing
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59316
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml b/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
index 179d2fa6e47..050ca64f03c 100644
--- a/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml b/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
index 50264bf27cf..eb73d4841b4 100644
--- a/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml b/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
index 3206bac8b49..4159716f919 100644
--- a/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml b/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
index 7a3a606c886..0c53c7733b1 100644
--- a/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
+++ b/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml b/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
index 36dbeae82e7..3d956eea357 100644
--- a/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
+++ b/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml b/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
index ef74ff6613f..97067bcc02f 100644
--- a/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
+++ b/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml b/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
index e2b9f141bb7..094d2ee6ce8 100644
--- a/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
+++ b/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml b/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
index 6cca3840faa..c58b03ce909 100644
--- a/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
+++ b/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml b/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
index c1fccc9f774..b0a04b9bff5 100644
--- a/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
+++ b/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml b/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
index 3b1abf6e0e1..64f3f452d79 100644
--- a/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
+++ b/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml b/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
index b3105b041f8..fe0bd0ba906 100644
--- a/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
+++ b/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
index 31b36bc8ad7..eb1a803ad08 100644
--- a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
@@ -7,7 +7,7 @@ product_stage:
 product_group:
 product_category:
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
index aaf9350cdaa..efed507fca3 100644
--- a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
@@ -7,7 +7,7 @@ product_stage:
 product_group:
 product_category:
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
index ded67e19e10..0452b4a418b 100644
--- a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
@@ -7,7 +7,7 @@ product_stage:
 product_group:
 product_category:
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
index 7f782d90f8d..da3b2f7bccd 100644
--- a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
@@ -7,7 +7,7 @@ product_stage:
 product_group:
 product_category:
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml b/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
new file mode 100644
index 00000000000..0ab87e2917e
--- /dev/null
+++ b/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
@@ -0,0 +1,21 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_load_conflict_ui_weekly
+name: load_conflict_ui
+description: Count of unique users per week who load the conflict resolution page
+product_section:
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+milestone: "13.12"
+time_frame: 7d
+data_source: redis_hll
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61654
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml b/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
new file mode 100644
index 00000000000..417483200e3
--- /dev/null
+++ b/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
@@ -0,0 +1,21 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_resolve_conflict_weekly
+name: resolve_conflict
+description: Count of unique users per week who attempt to resolve a conflict through the ui
+product_section:
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+milestone: "13.12"
+time_frame: 28d
+data_source: redis_hll
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61654
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml b/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
new file mode 100644
index 00000000000..3f1e1badc6e
--- /dev/null
+++ b/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.deploy_token_packages.i_package_helm_deploy_token_weekly
+description: Distinct Helm pakages deployed in recent 7 days
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package_registry
+value_type: number
+status: implemented
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61014
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml b/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
new file mode 100644
index 00000000000..1ebc70f497c
--- /dev/null
+++ b/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.user_packages.i_package_helm_user_weekly
+description: Distinct user count events for Helm packages in recent 7 days
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package_registry
+value_type: number
+status: implemented
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61014
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml b/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
new file mode 100644
index 00000000000..6d7f47cede4
--- /dev/null
+++ b/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
@@ -0,0 +1,19 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_click_diff_view_setting_weekly
+description: Count of users clicking diff view setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_all/20210216174826_ldap_users.yml b/config/metrics/counts_all/20210216174826_ldap_users.yml
deleted file mode 100644
index 34892c7ce90..00000000000
--- a/config/metrics/counts_all/20210216174826_ldap_users.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-key_path: counts.ldap_users
-description: Number of users that are linked to LDAP
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-- ee
-tier:
-- free
-- premium
-- ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
index 77baa673bb2..ce8674574f2 100644
--- a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
+++ b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.cycle_analytics_views
-description:
+description: Total visits to VSA (both group- and project-level) all time
 product_section: dev
 product_stage: manage
 product_group: group::optimize
@@ -8,9 +8,11 @@ product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
index 3b2561bae52..9f778fb4324 100644
--- a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
@@ -3,10 +3,11 @@ key_path: counts.projects_with_prometheus_alerts
 description: Projects with Prometheus alerting enabled
 product_section: ops
 product_stage: monitor
-product_group: group::apm
+product_group: group::monitor
 product_category: metrics
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '14.0'
 time_frame: all
 data_source: database
 distribution:
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 ad9a52c7ee7..d0bfba1cae2 100644
--- a/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
+++ b/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
@@ -3,10 +3,11 @@ key_path: counts.pod_logs_usages_total
 description: Count the total number of log views
 product_section: ops
 product_stage: monitor
-product_group: group::apm
+product_group: group::monitor
 product_category: logging
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '14.0'
 time_frame: all
 data_source: database
 distribution:
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 8e1129883ae..e9a534911bb 100644
--- a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
@@ -14,4 +14,3 @@ distribution:
 - ee
 tier:
 - free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175026_service_desk_issues.yml b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
index b852ae8b62f..299fbfa3b7f 100644
--- a/config/metrics/counts_all/20210216175026_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
@@ -14,4 +14,3 @@ distribution:
 - ee
 tier:
 - free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175028_requirements_created.yml b/config/metrics/counts_all/20210216175028_requirements_created.yml
deleted file mode 100644
index 74780f43c5a..00000000000
--- a/config/metrics/counts_all/20210216175028_requirements_created.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.requirements_created
-description: Count of requirements created
-product_section: dev
-product_stage: plan
-product_group: group::certify
-product_category: requirements_management
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
index ac4a31a5a08..0edd5cf3bbc 100644
--- a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
@@ -6,7 +6,8 @@ product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '14.0'
 time_frame: all
 data_source:
 distribution:
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 2257a325aa6..a5607b54d05 100644
--- a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
+++ b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
@@ -7,7 +7,8 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: deprecated
+status: removed
+milestone_removed: 14.0
 time_frame: all
 data_source: database
 distribution:
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 b716862c512..b8f5b8e8371 100644
--- a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
+++ b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
@@ -7,7 +7,8 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: deprecated
+status: removed
+milestone_removed: 14.0
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
index 74d2c99c5aa..0ab1020eadf 100644
--- a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
+++ b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
@@ -6,7 +6,8 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: deprecated
+status: removed
+milestone_removed: 14.0
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
index 7fce44b02cd..ecff0942267 100644
--- a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
+++ b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
@@ -6,7 +6,8 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: deprecated
+status: removed
+milestone_removed: 14.0
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
index 838837e223d..230a4b45f7e 100644
--- a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
+++ b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
@@ -6,7 +6,8 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: deprecated
+status: removed
+milestone_removed: 14.0
 time_frame: all
 data_source: database
 distribution:
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 1e6ee0d40cb..19539659357 100644
--- a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
+++ b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
@@ -6,7 +6,8 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: deprecated
+status: removed
+milestone_removed: 14.0
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216175510_ci_builds.yml b/config/metrics/counts_all/20210216175510_ci_builds.yml
index 5efe8e30dfd..29aaaaa3e02 100644
--- a/config/metrics/counts_all/20210216175510_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175510_ci_builds.yml
@@ -3,7 +3,7 @@ key_path: counts.ci_builds
 description: Unique builds in project
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
index 3c924b71ed5..c6195245083 100644
--- a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
@@ -3,7 +3,7 @@ key_path: counts.ci_internal_pipelines
 description: Total pipelines in GitLab repositories
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
index 49846e9521d..dde3fe3b962 100644
--- a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
@@ -3,7 +3,7 @@ key_path: counts.ci_external_pipelines
 description: Total pipelines in external repositories
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
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 95f160bac0e..003cf90d75a 100644
--- a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
@@ -3,7 +3,7 @@ key_path: counts.ci_pipeline_config_repository
 description: Total Pipelines from templates in repository
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216175520_ci_runners.yml b/config/metrics/counts_all/20210216175520_ci_runners.yml
index 991e966b05e..7264940d5a4 100644
--- a/config/metrics/counts_all/20210216175520_ci_runners.yml
+++ b/config/metrics/counts_all/20210216175520_ci_runners.yml
@@ -3,7 +3,7 @@ key_path: counts.ci_runners
 description: Total configured Runners in project
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216175521_ci_triggers.yml b/config/metrics/counts_all/20210216175521_ci_triggers.yml
index 38d5b621d0f..409794377cd 100644
--- a/config/metrics/counts_all/20210216175521_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175521_ci_triggers.yml
@@ -3,7 +3,7 @@ key_path: counts.ci_triggers
 description: Total configured Triggers in project
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
index 7c8aeac67b4..57237d36c0d 100644
--- a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
@@ -3,7 +3,7 @@ key_path: counts.ci_pipeline_schedules
 description: Pipeline schedules in GitLab
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216175525_ci_builds.yml b/config/metrics/counts_all/20210216175525_ci_builds.yml
index 16f1e46c94f..702c08ae286 100644
--- a/config/metrics/counts_all/20210216175525_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175525_ci_builds.yml
@@ -3,7 +3,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::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
index f97d7f31b67..53bbb30717d 100644
--- a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
@@ -3,7 +3,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::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
index 700152cc710..e888c9a6fd2 100644
--- a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
@@ -3,7 +3,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::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
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 a7d45a74e72..1dcc5e885c7 100644
--- a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
@@ -3,7 +3,7 @@ key_path: usage_activity_by_stage.verify.ci_pipeline_config_repository
 description: Total Pipelines from templates in repository
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
index dc34481c495..7ee753f6d32 100644
--- a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
@@ -3,7 +3,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::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216175537_ci_pipelines.yml b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
index 9447661e19c..a3bcc7eafbe 100644
--- a/config/metrics/counts_all/20210216175537_ci_pipelines.yml
+++ b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
@@ -3,7 +3,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::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216175539_ci_triggers.yml b/config/metrics/counts_all/20210216175539_ci_triggers.yml
index 85a7f097574..5b533f1e726 100644
--- a/config/metrics/counts_all/20210216175539_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175539_ci_triggers.yml
@@ -3,7 +3,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::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216175623_projects_asana_active.yml b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
index 724a00f7c18..efb8771ee35 100644
--- a/config/metrics/counts_all/20210216175623_projects_asana_active.yml
+++ b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175625_groups_asana_active.yml b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
index cdae2cdf020..574dcd21ba5 100644
--- a/config/metrics/counts_all/20210216175625_groups_asana_active.yml
+++ b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175627_templates_asana_active.yml b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
index df08683ab7a..f66dc3d3d18 100644
--- a/config/metrics/counts_all/20210216175627_templates_asana_active.yml
+++ b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175628_instances_asana_active.yml b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
index afaaf7f3b8c..b88ebad2b62 100644
--- a/config/metrics/counts_all/20210216175628_instances_asana_active.yml
+++ b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 efcaabdb817..8288135e4a6 100644
--- a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 4a8128f2600..bef134521f9 100644
--- a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
index 3a4e4c64c7a..802410374c1 100644
--- a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
index 100beb0991b..f1dd8937289 100644
--- a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
index f1bc7d0b08f..48ac16aaf82 100644
--- a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
index 049781d91f9..4f625b68679 100644
--- a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 c71e2efec84..15a55d66d5d 100644
--- a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 58f9e025ae6..e39ef4e175d 100644
--- a/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
index ffeccdddb5e..45094301a0c 100644
--- a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
index 4a9a6d695e8..ab3e27f0521 100644
--- a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
index 11d3abdc7f9..f09b32f4efd 100644
--- a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
index ce27c004aaf..98faf222d71 100644
--- a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 28bdc086a74..2e18cde5cd4 100644
--- a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 74a4c3618d2..83c793f9992 100644
--- a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
index 640aad49c0a..917d26db38c 100644
--- a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
index 2521b50e111..adfac50edb8 100644
--- a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
index 977bc0be0cf..f93bab2acb5 100644
--- a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
index 9a1714e918b..732eda5f97e 100644
--- a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 f4dffa88821..6098f982786 100644
--- a/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 c7c093d8ab7..261a73b5009 100644
--- a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
index debf9bb020f..3ebdf5cb7e8 100644
--- a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
index 2abea7b54d2..6dc86fc2e78 100644
--- a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
index 1520168a10a..7a4caddc9fa 100644
--- a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
index 1ce0ad19f97..91ca8b112a1 100644
--- a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 0073bdaf957..9b032b2ccdb 100644
--- a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 f8e5bcab9fd..dbd3ca666cb 100644
--- a/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
index 15d2e40b4ca..e6955d37aaf 100644
--- a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
index 284b7bab518..14ce92b9755 100644
--- a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
index 4a6df7ba877..72bb63ea683 100644
--- a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
index 5ab6dec5aa7..7d3b91b253c 100644
--- a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 fb53c49929f..fc00c5bc800 100644
--- a/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 9d974bf517b..3d62a32e0f8 100644
--- a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
index 075e56155fd..9c74e8ed761 100644
--- a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
index de152ddeb7d..de84d268e6e 100644
--- a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
index ff059277577..88889827cd5 100644
--- a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
index a2e36f00a12..6a441e394b8 100644
--- a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 15a6ffd6025..e94deefbe4f 100644
--- a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 e7928fff1c5..a73868e398b 100644
--- a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 0d0d2d86fdb..891bbb33777 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 e8cae4d24d7..6abbcb5554b 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 a67cd7c0435..59eb025f651 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 00bf681c870..364f8ce53bb 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 ba732a12259..6df170a48e0 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 294c557f9b1..f4dc9dcbc72 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175753_projects_discord_active.yml b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
index ab1e187d697..b564bc70e73 100644
--- a/config/metrics/counts_all/20210216175753_projects_discord_active.yml
+++ b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175755_groups_discord_active.yml b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
index 8684be04c4f..fb24c471210 100644
--- a/config/metrics/counts_all/20210216175755_groups_discord_active.yml
+++ b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175756_templates_discord_active.yml b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
index f66e3435221..e5a1082ca20 100644
--- a/config/metrics/counts_all/20210216175756_templates_discord_active.yml
+++ b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175758_instances_discord_active.yml b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
index 0dc37b7100c..039919523fe 100644
--- a/config/metrics/counts_all/20210216175758_instances_discord_active.yml
+++ b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 b5ef624a9da..b897c248629 100644
--- a/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 a6d4c8385f3..3cdb961ba2f 100644
--- a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 f8d53e6620e..cd9459478db 100644
--- a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 3dc182faa0c..c5487775c57 100644
--- a/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 3a45cd3aba0..09ac9cacefa 100644
--- a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 fd6581bff6a..c3a77a9c577 100644
--- a/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 f9d8ad12795..130072f42d1 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 c876ef22570..74e6d5c41bd 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 5dea679b5b0..8da08899b88 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 4bfbefe0b7d..0c6bdeae9b4 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 bc6764c1d17..93d77a19008 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 00c04e32b09..c526b9f18e9 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 ca2e0062f75..02581759ec3 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 7d2308cd39d..a49c9a88048 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 e570fdb964c..fa19cf0e9be 100644
--- a/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 4d680edf42a..6ee99ca89da 100644
--- a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 4efd0be8673..6d8b451b308 100644
--- a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 c435eed9dee..a83e2f27a58 100644
--- a/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 4c139e6ee8d..84836a95ae3 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 fe18e836df2..f7ee7624824 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
index e8d724b51b3..4520ef6b869 100644
--- a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
index 0d9f9a72cd3..d678e3174df 100644
--- a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
index f1715119217..f4765aa34f3 100644
--- a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
index e62259c965c..89a862d4cc8 100644
--- a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 53d09e2dab1..836ecbc0576 100644
--- a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 645d618705b..8af2e0733ac 100644
--- a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175848_projects_github_active.yml b/config/metrics/counts_all/20210216175848_projects_github_active.yml
deleted file mode 100644
index 6145fc599b9..00000000000
--- a/config/metrics/counts_all/20210216175848_projects_github_active.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-key_path: counts.projects_github_active
-description: Count of projects with active integrations for GitHub
-product_section: dev
-product_stage: create
-product_group: group::ecosystem
-product_category: integrations
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-- ee
-tier:
-- free
-- premium
-- ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175850_groups_github_active.yml b/config/metrics/counts_all/20210216175850_groups_github_active.yml
deleted file mode 100644
index 9a43b772447..00000000000
--- a/config/metrics/counts_all/20210216175850_groups_github_active.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-key_path: counts.groups_github_active
-description: Count of groups with active integrations for GitHub
-product_section: dev
-product_stage: create
-product_group: group::ecosystem
-product_category: integrations
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-- ee
-tier:
-- free
-- premium
-- ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175851_templates_github_active.yml b/config/metrics/counts_all/20210216175851_templates_github_active.yml
deleted file mode 100644
index f6ceed1233c..00000000000
--- a/config/metrics/counts_all/20210216175851_templates_github_active.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-key_path: counts.templates_github_active
-description: Count of active service templates for GitHub
-product_section: dev
-product_stage: create
-product_group: group::ecosystem
-product_category: integrations
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-- ee
-tier:
-- free
-- premium
-- ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175853_instances_github_active.yml b/config/metrics/counts_all/20210216175853_instances_github_active.yml
deleted file mode 100644
index 8150c0ec5a1..00000000000
--- a/config/metrics/counts_all/20210216175853_instances_github_active.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-key_path: counts.instances_github_active
-description: Count of active instance-level integrations for GitHub
-product_section: dev
-product_stage: create
-product_group: group::ecosystem
-product_category: integrations
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-- ee
-tier:
-- free
-- premium
-- ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml b/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml
deleted file mode 100644
index 6f5f366e72b..00000000000
--- a/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-key_path: counts.projects_inheriting_github_active
-description: Count of active projects inheriting integrations for GitHub
-product_section: dev
-product_stage: create
-product_group: group::ecosystem
-product_category: integrations
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-- ee
-tier:
-- free
-- premium
-- ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml b/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml
deleted file mode 100644
index 545fccc107e..00000000000
--- a/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-key_path: counts.groups_inheriting_github_active
-description: Count of active groups inheriting integrations for GitHub
-product_section: dev
-product_stage: create
-product_group: group::ecosystem
-product_category: integrations
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-- ee
-tier:
-- free
-- premium
-- ultimate
-skip_validation: true
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 d61e94c0df8..63c913a65a0 100644
--- a/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 0a23a43cdf3..ae34972f2e9 100644
--- a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 21cfa1ebf23..ecfffa98a04 100644
--- a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 4a3febf985a..5227013eb51 100644
--- a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 90773d663df..64e54c864bd 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 eda424840eb..3889c6e9a10 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
index 32bbcb11c30..e6b0c781cb5 100644
--- a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
index 1a8224ba446..4a55850b70d 100644
--- a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
index 6b24dedf93a..d022ac8261d 100644
--- a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
index 18d5e6f9666..c5460aecb21 100644
--- a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 da9f9df4fb7..5056947f70f 100644
--- a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 4d4c265d377..2069d8d703b 100644
--- a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175921_projects_irker_active.yml b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
index 7933389ccc0..d761968d629 100644
--- a/config/metrics/counts_all/20210216175921_projects_irker_active.yml
+++ b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175923_groups_irker_active.yml b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
index f845def2053..caa1d1eae8c 100644
--- a/config/metrics/counts_all/20210216175923_groups_irker_active.yml
+++ b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175924_templates_irker_active.yml b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
index f40cf42f648..e3d8b04f66c 100644
--- a/config/metrics/counts_all/20210216175924_templates_irker_active.yml
+++ b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175926_instances_irker_active.yml b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
index d0f6475446b..b6a7a07e83f 100644
--- a/config/metrics/counts_all/20210216175926_instances_irker_active.yml
+++ b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 b805ea65220..2a140890847 100644
--- a/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 99e624a52e8..4d023a1324c 100644
--- a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
index e16691fa13b..5562d5b3462 100644
--- a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
index ccbaa4f96b5..08617343a10 100644
--- a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
index badea034cd9..13f0d1547ad 100644
--- a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
index 181155322a5..8b03256b5ce 100644
--- a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 8dbdb6728bb..8726b9bbfb7 100644
--- a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 7cacd4e5c9c..1e5d400a385 100644
--- a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175943_projects_jira_active.yml b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
index 90d645da327..4bc46c3ca2a 100644
--- a/config/metrics/counts_all/20210216175943_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175945_groups_jira_active.yml b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
index c4fbc196733..0b8923f669c 100644
--- a/config/metrics/counts_all/20210216175945_groups_jira_active.yml
+++ b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175946_templates_jira_active.yml b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
index 861d83df3ec..be7b2c43d2e 100644
--- a/config/metrics/counts_all/20210216175946_templates_jira_active.yml
+++ b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175948_instances_jira_active.yml b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
index 2d0a7ec85ed..8b10ec30d5f 100644
--- a/config/metrics/counts_all/20210216175948_instances_jira_active.yml
+++ b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 6cf7750a60a..6e3d01b0382 100644
--- a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 0f84ed3863e..21148f3b62b 100644
--- a/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
index 67eca7e1fe9..dc81192fd9d 100644
--- a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
index 30a60716409..1a7a8fb69f6 100644
--- a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
index e78f17d0547..f1ec412d47c 100644
--- a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
index 8bf633cb085..8d1bab49e61 100644
--- a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 bca2354131d..64dcfaa0d8d 100644
--- a/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 df15e6db792..b6d52295217 100644
--- a/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 e0956199e13..5174090a00f 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 c5f7385d1b8..f7d2e6d99bc 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 504e9d39ee6..375908862a6 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 2ccd3bfecc4..f0cb0cd24f9 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 271614cff68..b79a39c6c13 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
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 df3b7e0175f..f9f9a438ad2 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
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 7f25eb0c4fe..e248d714da4 100644
--- a/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 5f23d34dadd..6d53d5675ed 100644
--- a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 fc5b0a2fbbe..bde0e661245 100644
--- a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 840e4c21ebb..eff81283775 100644
--- a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 52ee7de311b..ac3c4bad7c0 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 9f91b7119e1..6a39f71d40b 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
index 80ed0d39f9f..108c883b16a 100644
--- a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
index 464d1b4faed..635b98063b6 100644
--- a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
index a9b8fee8b7a..80c06a4666d 100644
--- a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
index e651adc3e37..15fc1ebef92 100644
--- a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 0e9ccdbb907..6bb67500dd8 100644
--- a/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 bd1a7750028..c47f2e3d363 100644
--- a/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 98cd4f28a6c..6f358cd4945 100644
--- a/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 e781c6a743e..be9042317fc 100644
--- a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 982e0fe8b37..84fe24687e2 100644
--- a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 86640daf752..8206ba25598 100644
--- a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 42f4638f79e..ff16dcbe7ce 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 c1c05c29637..d16cccfe6d8 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
index cc55d603e97..12d1ce1de38 100644
--- a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
index 170951d9295..a52c3edc339 100644
--- a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
index 9786b72a10f..eae2d8b2822 100644
--- a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
index 6988d6ebdd4..eade998165c 100644
--- a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 8bd473a7615..5d6f67a94b7 100644
--- a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 682ae485610..8377d603000 100644
--- a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
index 89584d140db..fb9a2146ebc 100644
--- a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
index d5502041537..0cf7c1bd572 100644
--- a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
index 598129d3ef6..fdee417531f 100644
--- a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
index 105fd4ff93a..bde6cf54e35 100644
--- a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 40b3e92c29e..44856dfe647 100644
--- a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 f99265b4c85..8e1ff124e43 100644
--- a/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
index d2b34fd0143..228827a60c6 100644
--- a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
index a3e68fd6d1a..10de4fb9743 100644
--- a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
index b0000ba32df..89efedbc7fc 100644
--- a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
index c3c0012e205..a10db3fa2ad 100644
--- a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 85ecfafcc70..6809afa4d4a 100644
--- a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 a929408e5da..9ae0bc0bfd7 100644
--- a/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180122_projects_slack_active.yml b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
index 2b6b06e97d9..3a5bec84a58 100644
--- a/config/metrics/counts_all/20210216180122_projects_slack_active.yml
+++ b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180124_groups_slack_active.yml b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
index 60175f2861f..c63632dd59b 100644
--- a/config/metrics/counts_all/20210216180124_groups_slack_active.yml
+++ b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180126_templates_slack_active.yml b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
index 3fe78e3b847..0bee63532a4 100644
--- a/config/metrics/counts_all/20210216180126_templates_slack_active.yml
+++ b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180127_instances_slack_active.yml b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
index cb98faf7494..3a74a68251d 100644
--- a/config/metrics/counts_all/20210216180127_instances_slack_active.yml
+++ b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 4f5613fb904..304d780314f 100644
--- a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 780104bd60e..ebb7b88d10b 100644
--- a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 e2ae91c83ce..06c45e12040 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 0850c45bcc1..e277c4b7d41 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 b68cee5b004..3751024afdd 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 c629bbe7b81..69717f5a917 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 5fbba405579..20bd18be435 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 96cc7b0bcaa..6dc9498c679 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
index 482360e0c87..2011d5cd7cc 100644
--- a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
index efaf3b72f08..2a12be8c9c5 100644
--- a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
index 8fe6f5997f3..528873a7139 100644
--- a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
index 52f6d89497d..13beb25b4f7 100644
--- a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 e8ea1ffb556..0e3b2af2e45 100644
--- a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 4656bda6da0..026d6a2789c 100644
--- a/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 4d783cd061f..4d1d728ef32 100644
--- a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 074ab951200..d926c2f81d5 100644
--- a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 99f54dfa276..a96ab7ff256 100644
--- a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 0ca2893868c..1fc4f19b77f 100644
--- a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 30172dcac3f..6af475ee5b0 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 4334a352566..01e4782ec20 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 7590bf98d81..c8624623371 100644
--- a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 15f4ccda503..4b4c0b0835f 100644
--- a/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 36d21424329..4cb97212de3 100644
--- a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 0b66249713b..bf8277ce740 100644
--- a/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 b1b91278215..bf09ee1e791 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 bd1986796d7..3d1a01b4c92 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
index 1225d494f77..8693bbeabc2 100644
--- a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
index 47389011bcf..9c0b4c7404d 100644
--- a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
index c89c8602877..7b852f69b7f 100644
--- a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
index a5316c15120..33eb2139a20 100644
--- a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 982ad4dfdad..f68a0049429 100644
--- a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 2a86d74ebf3..a758fdb63e5 100644
--- a/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 88d0d954780..503a76eb05a 100644
--- a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
+++ b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 d2a5cfc062c..1b79cde456b 100644
--- a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 aa362c989de..33e42e55558 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 fb3df0de122..5866c2e8eab 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
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180239_personal_snippets.yml b/config/metrics/counts_all/20210216180239_personal_snippets.yml
index 1578c3264f3..fa112c2ebed 100644
--- a/config/metrics/counts_all/20210216180239_personal_snippets.yml
+++ b/config/metrics/counts_all/20210216180239_personal_snippets.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.personal_snippets
-description: Count of Personal Snippets
+description: Count of personal Snippets
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180241_project_snippets.yml b/config/metrics/counts_all/20210216180241_project_snippets.yml
index f30757e4137..d0921d1a365 100644
--- a/config/metrics/counts_all/20210216180241_project_snippets.yml
+++ b/config/metrics/counts_all/20210216180241_project_snippets.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.project_snippets
-description: Count of Project Snippetss
+description: Count of project Snippets
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180242_web_ide_commits.yml b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
index 33566cf602f..7b3953e92d3 100644
--- a/config/metrics/counts_all/20210216180242_web_ide_commits.yml
+++ b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.web_ide_commits
-description: Count of Commits made from Web IDE
+description: Count of commits made from the Web IDE
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -8,7 +8,7 @@ product_category: web_ide
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180244_web_ide_views.yml b/config/metrics/counts_all/20210216180244_web_ide_views.yml
index 5f94d706cdd..d6b8c0b4626 100644
--- a/config/metrics/counts_all/20210216180244_web_ide_views.yml
+++ b/config/metrics/counts_all/20210216180244_web_ide_views.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.web_ide_views
-description: Count of Views of the Web IDE
+description: Count of views of the Web IDE
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -8,7 +8,7 @@ product_category: web_ide
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 d8ab29b3ef5..6361f63ac81 100644
--- a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.web_ide_merge_requests
-description: Count of merge requests created from Web IDE
+description: Count of merge requests created from the Web IDE
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -8,7 +8,7 @@ product_category: web_ide
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180248_web_ide_previews.yml b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
index 854fe84155e..bd8cc0ea829 100644
--- a/config/metrics/counts_all/20210216180248_web_ide_previews.yml
+++ b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.web_ide_previews
-description: Count of Live Preview tab views in Web IDE
+description: Count of Live Preview tab views in the Web IDE
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -8,7 +8,7 @@ product_category: web_ide
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
index 8860a73c262..8e92d080abe 100644
--- a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
+++ b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.web_ide_terminals
-description: Count of Web Terminal Tab views in Web IDE
+description: Count of Web Terminal tab views in the Web IDE
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -8,7 +8,7 @@ product_category: web_ide
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
index 229a4000fde..b4d38b2060f 100644
--- a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
+++ b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.web_ide_pipelines
-description: Count of Pipeline tab views in Web IDE
+description: Count of Pipeline tab views in the Web IDE
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -8,7 +8,7 @@ product_category: web_ide
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180253_snippet_comment.yml b/config/metrics/counts_all/20210216180253_snippet_comment.yml
index 86353b84645..012d04f0ad0 100644
--- a/config/metrics/counts_all/20210216180253_snippet_comment.yml
+++ b/config/metrics/counts_all/20210216180253_snippet_comment.yml
@@ -8,7 +8,7 @@ product_category: snippets
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180255_snippet_create.yml b/config/metrics/counts_all/20210216180255_snippet_create.yml
index 5b527992d12..3b48c9cb4b7 100644
--- a/config/metrics/counts_all/20210216180255_snippet_create.yml
+++ b/config/metrics/counts_all/20210216180255_snippet_create.yml
@@ -8,7 +8,7 @@ product_category: snippets
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180257_snippet_update.yml b/config/metrics/counts_all/20210216180257_snippet_update.yml
index 2c909d8a9fc..993f03f3007 100644
--- a/config/metrics/counts_all/20210216180257_snippet_update.yml
+++ b/config/metrics/counts_all/20210216180257_snippet_update.yml
@@ -8,7 +8,7 @@ product_category: snippets
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 e5836202a74..afaf4170a22 100644
--- a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
+++ b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.static_site_editor_views
-description:
+description: Count of Static Site Editor views
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -8,7 +8,7 @@ product_category: static_site_editor
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
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 5dc21447e37..eb7deaac1bd 100644
--- a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
+++ b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.static_site_editor_commits
-description: Count of commits created via Static Site Editor
+description: Count of commits created from the Static Site Editor
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -8,9 +8,11 @@ product_category: static_site_editor
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
index 3e38b9f8f7b..8a0c28cc904 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
@@ -8,9 +8,11 @@ product_category: static_site_editor
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml b/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
index 2223e4b2e46..0239da15609 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
@@ -1,10 +1,10 @@
 ---
 key_path: counts.user_preferences_user_gitpod_enabled
-description: Count all users with their GitPod setting enabled
+description: Count of users with the GitPod integration enabled
 product_section: dev
 product_stage: create
 product_group: group::editor
-product_category: editor_extension
+product_category: web_ide
 value_type: number
 status: data_available
 time_frame: all
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180306_snippets.yml b/config/metrics/counts_all/20210216180306_snippets.yml
index 213e61e2d0f..c78d77b9e55 100644
--- a/config/metrics/counts_all/20210216180306_snippets.yml
+++ b/config/metrics/counts_all/20210216180306_snippets.yml
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180316_snippets.yml b/config/metrics/counts_all/20210216180316_snippets.yml
index 8c829055aa0..dd31cda76b8 100644
--- a/config/metrics/counts_all/20210216180316_snippets.yml
+++ b/config/metrics/counts_all/20210216180316_snippets.yml
@@ -1,6 +1,7 @@
 ---
 key_path: usage_activity_by_stage.create.snippets
-description: Snippets
+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
@@ -8,7 +9,7 @@ product_category: snippets
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -16,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
index 3fbbbdece3d..44221482c4f 100644
--- a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
+++ b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
@@ -1,6 +1,6 @@
 ---
 key_path: counts.projects_creating_incidents
-description: Counts of Projects that have created incidents
+description: Counts of Projects that have incident issues, regardless of status.
 product_section: ops
 product_stage: monitor
 product_group: group::health
diff --git a/config/metrics/counts_all/20210216180638_gitlab_project.yml b/config/metrics/counts_all/20210216180638_gitlab_project.yml
index a9d167f7363..624b004155d 100644
--- a/config/metrics/counts_all/20210216180638_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180638_gitlab_project.yml
@@ -8,9 +8,11 @@ product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180639_gitlab.yml b/config/metrics/counts_all/20210216180639_gitlab.yml
index 3fef2ce3b85..39a878962d2 100644
--- a/config/metrics/counts_all/20210216180639_gitlab.yml
+++ b/config/metrics/counts_all/20210216180639_gitlab.yml
@@ -8,9 +8,11 @@ product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180641_github.yml b/config/metrics/counts_all/20210216180641_github.yml
index 530e9b05e14..c7ce1a7f1b3 100644
--- a/config/metrics/counts_all/20210216180641_github.yml
+++ b/config/metrics/counts_all/20210216180641_github.yml
@@ -8,9 +8,11 @@ product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180643_bitbucket.yml b/config/metrics/counts_all/20210216180643_bitbucket.yml
index 6490c8ffb55..e05e4e526ff 100644
--- a/config/metrics/counts_all/20210216180643_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180643_bitbucket.yml
@@ -8,9 +8,11 @@ product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180645_bitbucket_server.yml b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
index bfbee0b3433..88f618ac228 100644
--- a/config/metrics/counts_all/20210216180645_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
@@ -8,9 +8,11 @@ product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180647_gitea.yml b/config/metrics/counts_all/20210216180647_gitea.yml
index 74b4fd36714..d70b478659d 100644
--- a/config/metrics/counts_all/20210216180647_gitea.yml
+++ b/config/metrics/counts_all/20210216180647_gitea.yml
@@ -8,9 +8,11 @@ product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180649_git.yml b/config/metrics/counts_all/20210216180649_git.yml
index b7dd7ca8d7e..19c19e6cc63 100644
--- a/config/metrics/counts_all/20210216180649_git.yml
+++ b/config/metrics/counts_all/20210216180649_git.yml
@@ -8,9 +8,11 @@ product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180650_manifest.yml b/config/metrics/counts_all/20210216180650_manifest.yml
index 4ef7823ee67..6c89c68b34c 100644
--- a/config/metrics/counts_all/20210216180650_manifest.yml
+++ b/config/metrics/counts_all/20210216180650_manifest.yml
@@ -8,9 +8,11 @@ product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180652_gitlab_migration.yml b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
index 3df4472c9a7..d1c84d6c795 100644
--- a/config/metrics/counts_all/20210216180652_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
@@ -8,9 +8,11 @@ product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
index cd69803d569..90f20d71997 100644
--- a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
+++ b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.wiki_pages_create
-description:
+description: Count of all Wiki pages created
 product_section: dev
 product_stage: create
-product_group: group::knowledge
+product_group: group::editor
 product_category: wiki
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
index ee44817090a..ad257389f1f 100644
--- a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
+++ b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.wiki_pages_update
-description:
+description: Count of all Wiki page updates
 product_section: dev
 product_stage: create
-product_group: group::knowledge
+product_group: group::editor
 product_category: wiki
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
index a7670d1578b..83379f14ba0 100644
--- a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
+++ b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.wiki_pages_delete
-description:
+description: Count of all Wiki pages deleted
 product_section: dev
 product_stage: create
-product_group: group::knowledge
+product_group: group::editor
 product_category: wiki
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
index 1968f26c08e..bd631db3e6c 100644
--- a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
+++ b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.design_management_designs_create
-description:
+description: Number of designs that were created
 product_section: dev
-product_stage: create
-product_group: group::knowledge
+product_stage: plan
+product_group: group::product planning
 product_category: design_management
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
index 087afae23ad..1a11c45f22a 100644
--- a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
+++ b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.design_management_designs_update
-description:
+description: Number of updates to designs
 product_section: dev
-product_stage: create
-product_group: group::knowledge
+product_stage: plan
+product_group: group::product planning
 product_category: design_management
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
index 874e5a60243..0cbdac33f1e 100644
--- a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
+++ b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.design_management_designs_delete
-description:
+description: Number of designs that were deleted
 product_section: dev
-product_stage: create
-product_group: group::knowledge
+product_stage: plan
+product_group: group::product planning
 product_category: design_management
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180750_groups.yml b/config/metrics/counts_all/20210216180750_groups.yml
index e236c4b89a8..db2cfd470ab 100644
--- a/config/metrics/counts_all/20210216180750_groups.yml
+++ b/config/metrics/counts_all/20210216180750_groups.yml
@@ -2,8 +2,8 @@
 key_path: counts.groups
 description: Total count of groups as of usage ping snapshot
 product_section: dev
-product_stage:
-product_group: group::manage
+product_stage: manage
+product_group: group::access
 product_category: subgroups
 value_type: number
 status: data_available
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180752_keys.yml b/config/metrics/counts_all/20210216180752_keys.yml
index 4374ebcb9c1..03027fd8e24 100644
--- a/config/metrics/counts_all/20210216180752_keys.yml
+++ b/config/metrics/counts_all/20210216180752_keys.yml
@@ -1,9 +1,9 @@
 ---
 key_path: counts.keys
-description:
+description: Number of keys.
 product_section: dev
-product_stage:
-product_group: group::manage
+product_stage: managed
+product_group: group::access
 product_category: authentication_and_authorization
 value_type: number
 status: data_available
@@ -11,6 +11,8 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180756_groups.yml b/config/metrics/counts_all/20210216180756_groups.yml
index e789713fc31..4a813247d21 100644
--- a/config/metrics/counts_all/20210216180756_groups.yml
+++ b/config/metrics/counts_all/20210216180756_groups.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage.manage.groups
-description:
+description: Number of users who are group members.
 product_section: dev
-product_stage:
-product_group: group::manage
-product_category:
+product_stage: manage
+product_group: group::access
+product_category: subgroups
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180758_users_created.yml b/config/metrics/counts_all/20210216180758_users_created.yml
index 1e722716546..262f88e2713 100644
--- a/config/metrics/counts_all/20210216180758_users_created.yml
+++ b/config/metrics/counts_all/20210216180758_users_created.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage.manage.users_created
-description:
+description: Number of users
 product_section: dev
-product_stage:
-product_group: group::manage
+product_stage: manage
+product_group: group::access
 product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180800_ldap_keys.yml b/config/metrics/counts_all/20210216180800_ldap_keys.yml
deleted file mode 100644
index b3c97800b9b..00000000000
--- a/config/metrics/counts_all/20210216180800_ldap_keys.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.manage.ldap_keys
-description:
-product_section: dev
-product_stage:
-product_group: group::manage
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180801_ldap_users.yml b/config/metrics/counts_all/20210216180801_ldap_users.yml
deleted file mode 100644
index 075189ba9b7..00000000000
--- a/config/metrics/counts_all/20210216180801_ldap_users.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: usage_activity_by_stage.manage.ldap_users
-description:
-product_section: dev
-product_stage:
-product_group: group::manage
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216181009_lfs_objects.yml b/config/metrics/counts_all/20210216181009_lfs_objects.yml
index fe221ae2c47..b17b029852c 100644
--- a/config/metrics/counts_all/20210216181009_lfs_objects.yml
+++ b/config/metrics/counts_all/20210216181009_lfs_objects.yml
@@ -2,8 +2,8 @@
 key_path: counts.lfs_objects
 description:
 product_section: ops
-product_stage: package
-product_group: group::package
+product_stage: create
+product_group: group::create
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216181011_projects_with_packages.yml b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
index 2dee15b9438..8d81edaa55f 100644
--- a/config/metrics/counts_all/20210216181011_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
@@ -1,17 +1,18 @@
 ---
 key_path: counts.projects_with_packages
-description: Projects with package registry configured
+description: Projects with package registry enabled
 product_section: ops
-product_stage:
+product_stage: package
 product_group: group::package
-product_category:
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
-- ce
 - ee
+- ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216181012_packages.yml b/config/metrics/counts_all/20210216181012_packages.yml
index 2843f223d9e..2934ebdc3d7 100644
--- a/config/metrics/counts_all/20210216181012_packages.yml
+++ b/config/metrics/counts_all/20210216181012_packages.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.packages
-description: Number of packages
+description: The total number of packages published to the registry
 product_section: ops
-product_stage:
+product_stage: package
 product_group: group::package
-product_category:
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 69b893251ac..dbc5e4c0d0a 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.projects_with_expiration_policy_disabled
-description:
+description: The number of projects with cleanup policy for tags turned off
 product_section: ops
 product_stage: package
 product_group: group::package
-product_category:
+product_category: container registry
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 9e06674dc61..a71a36f19ca 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.projects_with_expiration_policy_enabled
-description:
+description: A count of projects with the cleanup policy for tags turned on
 product_section: ops
 product_stage: package
 product_group: group::package
-product_category:
+product_category: container registry
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..7cf495c6091
--- /dev/null
+++ b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
@@ -0,0 +1,18 @@
+---
+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_category: container registry
+value_type: number
+status: data_available
+time_frame: all
+data_source: database
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..143d47835aa
--- /dev/null
+++ b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
@@ -0,0 +1,18 @@
+---
+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_category: container registry
+value_type: number
+status: data_available
+time_frame: all
+data_source: database
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..27ae7c56c24
--- /dev/null
+++ b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
@@ -0,0 +1,18 @@
+---
+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_category: container registry
+value_type: number
+status: data_available
+time_frame: all
+data_source: database
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..2c1c00ec965
--- /dev/null
+++ b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
@@ -0,0 +1,18 @@
+---
+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_category: container registry
+value_type: number
+status: data_available
+time_frame: all
+data_source: database
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..b735f009dae
--- /dev/null
+++ b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
@@ -0,0 +1,18 @@
+---
+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_category: container registry
+value_type: number
+status: data_available
+time_frame: all
+data_source: database
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..a14f17039e9
--- /dev/null
+++ b/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
@@ -0,0 +1,18 @@
+---
+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_category: container registry
+value_type: number
+status: data_available
+time_frame: all
+data_source: database
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
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 907fa82882c..daf4551b16d 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_1d
-description:
+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_category:
+product_category: container registry
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 55ae6fc7a24..f67df5897ff 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_7d
-description:
+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_category:
+product_category: container registry
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 2e0bb6e06f5..5ac7179b486 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_14d
-description:
+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_category:
+product_category: container registry
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 5b6ec558b76..25ce0d633e4 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_1month
-description:
+description: A count of projects with the cleanup policy set to run monthly
 product_section: ops
 product_stage: package
 product_group: group::package
-product_category:
+product_category: container registry
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 6028972324d..f8df648b170 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_3month
-description:
+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_category:
+product_category: container registry
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 c1bd230ec5b..29926d961e4 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_7d
-description:
+description: A count of projects with the cleanup policy set delete tags older than 7 days
 product_section: ops
 product_stage: package
 product_group: group::package
-product_category:
+product_category: container registry
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 fc2e647a05e..28e905f980b 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_14d
-description:
+description: A count of projects with the cleanup policy set delete tags older than 14 days
 product_section: ops
 product_stage: package
 product_group: group::package
-product_category:
+product_category: container registry
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 e8816d6f4f2..db0db2762d4 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_30d
-description:
+description: A count of projects with the cleanup policy set delete tags older than 30 days
 product_section: ops
 product_stage: package
 product_group: group::package
-product_category:
+product_category: container registry
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 367eae45062..c1854ea634a 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_90d
-description:
+description: A count of projects with the cleanup policy set delete tags older than 90 days
 product_section: ops
 product_stage: package
 product_group: group::package
-product_category:
+product_category: container registry
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..983687d7a6c
--- /dev/null
+++ b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
@@ -0,0 +1,18 @@
+---
+key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_unset
+description: A count of projects with the cleanup policy with the number of tags to keep unset
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: container registry
+value_type: number
+status: data_available
+time_frame: all
+data_source: database
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
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 f89b6ef698e..23f0b9b3b47 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_unset
-description:
+description: A count of projects with the cleanup policy with the number of tags to delete unset
 product_section: ops
 product_stage: package
 product_group: group::package
-product_category:
+product_category: container registry
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216181051_vendor.yml b/config/metrics/counts_all/20210216181051_vendor.yml
index 1233659fa5c..29fc84d1b1c 100644
--- a/config/metrics/counts_all/20210216181051_vendor.yml
+++ b/config/metrics/counts_all/20210216181051_vendor.yml
@@ -1,17 +1,18 @@
 ---
 key_path: container_registry_server.vendor
-description: Identifies if a user is using an external container registry and what
-  type
+description: Identifies if a user is using an external container registry and what type
 product_section: ops
 product_stage: package
 product_group: group::package
-product_category:
+product_category: container registry
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216181055_projects_with_packages.yml b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
index 55ea64a66a8..fb006b7f9ec 100644
--- a/config/metrics/counts_all/20210216181055_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage.package.projects_with_packages
-description: Projects with package registry configured
+description: Projects with package registry enabled
 product_section: ops
 product_stage: package
 product_group: group::package
-product_category:
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 321273f800e..df04f5d0669 100644
--- a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
+++ b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
@@ -15,4 +15,4 @@ distribution:
 tier:
 - free
 - premium
-- ultimate
\ No newline at end of file
+- ultimate
diff --git a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
index a96a88e9dab..66ec14d7c4d 100644
--- a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.projects_datadog_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: 'Count of projects with active integrations for Datadog'
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
index caf9633e57f..1bc3803d82f 100644
--- a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.groups_datadog_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of groups with active integrations for Datadog
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
index 9d911c6becf..8842e75f875 100644
--- a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.templates_datadog_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of active service templates for Datadog
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
index 25f6a6468d7..be281f26290 100644
--- a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.instances_datadog_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of active instance-level integrations for Datadog
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
index 97bfc3d2301..2c2d2aa6cb1 100644
--- a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.projects_inheriting_datadog_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of active projects inheriting integrations for Datadog
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
index 6cbbcadbe04..324b461ceea 100644
--- a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.groups_inheriting_datadog_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of active groups inheriting integrations for Datadog
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
index a0c8d827951..057906ecffd 100644
--- a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.projects_ewm_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: 'Count of projects with active integrations for EWM'
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
index d41905af3b6..164466c69ba 100644
--- a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.groups_ewm_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of groups with active integrations for EWM
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
index 0ef26b5b144..3bda8e71ac6 100644
--- a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.templates_ewm_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of active service templates for EWM
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
index 29d73ebb943..57cda20793b 100644
--- a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.instances_ewm_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of active instance-level integrations for EWM
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
index 8b6da149dfa..108ff88ee52 100644
--- a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.projects_inheriting_ewm_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of active projects inheriting integrations for EWM
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
index 995849e5945..dd9902c0b41 100644
--- a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
@@ -1,16 +1,18 @@
 ---
 key_path: counts.groups_inheriting_ewm_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of active groups inheriting integrations for EWM
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
index 1e7377ed707..cce2dedb709 100644
--- a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
@@ -1,16 +1,19 @@
 ---
 key_path: counts.projects_mock_ci_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects with active integrations for Mock CI
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.12'
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 adf7175c7c6..b41982786a9 100644
--- a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
@@ -1,16 +1,19 @@
 ---
 key_path: counts.groups_mock_ci_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of groups with active integrations for Mock CI
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.12'
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 654ffad1ba6..786ecefcf1c 100644
--- a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
@@ -1,16 +1,19 @@
 ---
 key_path: counts.templates_mock_ci_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of active service templates for Mock CI
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.12'
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 41958f501b7..13d5f4cc809 100644
--- a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
@@ -1,16 +1,19 @@
 ---
 key_path: counts.instances_mock_ci_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of active instance-level integrations for  Mock CI
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.12'
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 63bafcd95d7..836d02ef768 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
@@ -1,16 +1,19 @@
 ---
 key_path: counts.projects_inheriting_mock_ci_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of active projects inheriting integrations for Mock CI
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.12'
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 994e9665ff1..723399c5d04 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
@@ -1,16 +1,19 @@
 ---
 key_path: counts.groups_inheriting_mock_ci_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of active groups inheriting integrations for Mock CI
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.12'
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 c12bcfc76ae..f2addef450d 100644
--- a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
@@ -1,16 +1,19 @@
 ---
 key_path: counts.projects_mock_monitoring_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects with active integrations for Mock Monitoring
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.12'
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 414d3723f9b..282fd487d3d 100644
--- a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
@@ -1,16 +1,19 @@
 ---
 key_path: counts.groups_mock_monitoring_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of groups with active integrations for Mock Monitoring
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.12'
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 48397435310..e3f70b4a679 100644
--- a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
@@ -1,16 +1,19 @@
 ---
 key_path: counts.templates_mock_monitoring_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of active service templates for Mock Monitoring
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.12'
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 671c0574892..fed7a283e14 100644
--- a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
@@ -1,16 +1,19 @@
 ---
 key_path: counts.instances_mock_monitoring_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of active instance-level integrations for  Mock Monitoring
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.12'
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 895e0f03505..690d27ecb63 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
@@ -1,16 +1,19 @@
 ---
 key_path: counts.projects_inheriting_mock_monitoring_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of active projects inheriting integrations for Mock Monitoring
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.12'
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 27206fb724f..a22e3be20a4 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
@@ -1,16 +1,19 @@
 ---
 key_path: counts.groups_inheriting_mock_monitoring_active
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of active groups inheriting integrations for Mock Monitoring
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: number
-status: data_available
+status: removed
+milestone_removed: '13.12'
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 fb26328eb81..3ad8d02cb1d 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_composer_delete_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of Composer packages that have been deleted
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 010067763b5..e6d056f6cc3 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_composer_pull_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of Composer packages that have been downloaded
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 11ccbf3b27e..7aaa3d5d9d0 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_composer_push_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of Composer packages that have been published
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 9091fc299ee..9baa6d0b535 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_conan_delete_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of Conan packages that have been deleted
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 91cea7e5f4f..9465a30e6a5 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_conan_pull_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of Conan packages that have been downloaded
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 4b4e08c0631..6bc0ea59256 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_conan_push_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of Conan packages that have been published
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 b87bc78265c..d475ea39438 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_container_delete_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of container images that have been deleted
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: container registry
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 4ca264fc57f..7a9070b623a 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_container_pull_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of container images that have been downloaded
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: container registry
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 ea30df537f2..11402a7b5e7 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_container_push_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of container images that have been published
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: container registry
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 e05cbbdc3a9..25fd4257ed2 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_debian_delete_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of Debian packages that have been deleted
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 6e0635e7108..c4017a636a5 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_debian_pull_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of Debian packages that have been downloaded
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 818d32cf911..7af47fe182d 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_debian_push_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of Debian packages that have been published
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 3bec73ead90..11196fc56c3 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_delete_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of packages that have been deleted
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 4ac31ac255b..00650c4a139 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_delete_package_by_deploy_token
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of packages that have been deleted using a Deploy Token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 8a3cb104b6a..f8240096bb9 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_delete_package_by_guest
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of packages that have been deleted using a Guest
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 c0bf7f79ebc..012d7d2bf39 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_delete_package_by_user
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+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_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 e38a6a4910e..fda3a7065e1 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_generic_delete_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of generic packages that have been deleted
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 29e08dd04fe..34b718a2497 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_generic_pull_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of generic packages that have been downloaded
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 9dbd7572df6..5c39995a1b2 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_generic_push_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of generic packages that have been published
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 9dda1569073..c856484e691 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_golang_delete_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of Go modules that have been deleted
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 8a0399ca1be..e4bfe9f50d6 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_golang_pull_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of Go modules that have been downloaded
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 5c83f5533d0..6bfc5255e9f 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_golang_push_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of Go modules that have been published
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 5ebdc064a11..43c8d16986d 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_maven_delete_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of Maven packages that have been deleted
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 6749fba2c3b..3c95516325e 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_maven_pull_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of Maven packages that have been downloaded
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 f329104f2b2..d1843778ad9 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_maven_push_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of Maven packages that have been published
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 b8653d5a27e..2c3ca5d1dfb 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_npm_delete_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of npm packages that have been deleted
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 54799778680..639ecf0b0fb 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_npm_pull_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of npm packages that have been downloaded
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 c9c5f43627a..815c2b0194d 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_npm_push_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of npm packages that have been published
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 1f410f5ae95..1cd5ec0e63f 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_nuget_delete_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of NuGet packages that have been deleted
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 4b7abb5af70..06f2b212ecc 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_nuget_pull_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of NuGet packages that have been downloaded
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 3812514b79d..2cbe0345ccc 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_nuget_push_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of NuGet packages that have been published
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 dd3c335235b..879cfd64e03 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_pull_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of packages that have been downloaded from the package registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 1114eb321ca..048286d10bf 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_pull_package_by_deploy_token
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of packages that have been downloaded from the package registry using a Deploy Token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 f76cac6886b..58e7b47407b 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_pull_package_by_guest
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of packages that have been downloaded from the package registry by a guest
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 fa4ee39ed81..d7cac5b13f1 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_pull_package_by_user
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of packages that have been downloaded from the package registry by a user
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 2905f0fa31a..a4008091a8a 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_push_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of packages that have been published to the package registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source:  redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 920875186bd..5e4f76b1bad 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_push_package_by_deploy_token
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of packages that have been published to the package registry using a deploy token
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 a360e34eaec..6205204cb5a 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_push_package_by_guest
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of packages that have been published to the package registry by a Guest
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 5fd7d2b3ee3..bb2bac41a08 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_push_package_by_user
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of packages that have been published to the package registry by a user
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 a943cce5ecb..42c579ba3be 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_pypi_delete_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+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_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 a15794a05f1..06b6e8de0b0 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_pypi_pull_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: A count of Python packages that have been downloaded from the package registry
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 ea0c217997a..98bd5734c3b 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_pypi_push_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+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_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 c35c455e5d7..963ceae076d 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_tag_delete_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+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_category: package registry
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 7b2f0fcca5b..14021b24575 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_tag_pull_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+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_category: package registry
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 6f5a0bc7a8b..4991ccbd835 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
@@ -1,16 +1,18 @@
 ---
 key_path: counts.package_events_i_package_tag_push_package
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+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_category: package registry
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216183400_omniauth_providers.yml b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
index ab73b3fca22..bb2be873f57 100644
--- a/config/metrics/counts_all/20210216183400_omniauth_providers.yml
+++ b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
@@ -1,16 +1,17 @@
 ---
 key_path: usage_activity_by_stage.manage.omniauth_providers
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of unique user logins using an OmniAuth provider
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216183402_two-factor.yml b/config/metrics/counts_all/20210216183402_two-factor.yml
index 777d4d1cdef..a2daf5c3299 100644
--- a/config/metrics/counts_all/20210216183402_two-factor.yml
+++ b/config/metrics/counts_all/20210216183402_two-factor.yml
@@ -1,16 +1,17 @@
 ---
 key_path: usage_activity_by_stage.manage.user_auth_by_provider.two-factor
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of unique user logins using two factor authentication
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml b/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
index 99c1f289658..42ac42195a1 100644
--- a/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
+++ b/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
@@ -1,16 +1,17 @@
 ---
 key_path: usage_activity_by_stage.manage.user_auth_by_provider.two-factor-via-u2f-device
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of unique user logins using two factor via a U2F device
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml b/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
index 1ea27e42ed0..663a15dbdaa 100644
--- a/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
+++ b/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
@@ -1,16 +1,17 @@
 ---
 key_path: usage_activity_by_stage.manage.user_auth_by_provider.two-factor-via-webauthn-device
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of unique user logins using two factor via a WebAuthn device
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216183408_standard.yml b/config/metrics/counts_all/20210216183408_standard.yml
index 55b4a984ae2..0a0b1684b50 100644
--- a/config/metrics/counts_all/20210216183408_standard.yml
+++ b/config/metrics/counts_all/20210216183408_standard.yml
@@ -1,16 +1,17 @@
 ---
 key_path: usage_activity_by_stage.manage.user_auth_by_provider.standard
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of unique user logins using password authentication
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216183410_google_oauth2.yml b/config/metrics/counts_all/20210216183410_google_oauth2.yml
index c2fd5fad5ff..d644033c5cc 100644
--- a/config/metrics/counts_all/20210216183410_google_oauth2.yml
+++ b/config/metrics/counts_all/20210216183410_google_oauth2.yml
@@ -1,16 +1,17 @@
 ---
 key_path: usage_activity_by_stage.manage.user_auth_by_provider.google_oauth2
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of unique user logins using Google OAuth authentication
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
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 d16181a9531..15859a10f59 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
@@ -6,7 +6,7 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
 time_frame: all
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 fcb11b68ccf..d766fd5efac 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
@@ -6,7 +6,7 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
 time_frame: all
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 c9812f109a0..4f923f250d0 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
@@ -6,7 +6,7 @@ product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
-status: implemented
+status: data_available
 milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
 time_frame: all
diff --git a/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml b/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml
index 54dffb5573a..25b6c0f4e93 100644
--- a/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml
+++ b/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml
@@ -7,7 +7,7 @@ product_stage:
 product_group:
 product_category:
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.11"
 introduced_by_url:
 time_frame: all
diff --git a/config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml b/config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml
index 0ce05fb84e2..d1a818fe3e1 100644
--- a/config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml
+++ b/config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml
@@ -7,7 +7,7 @@ product_stage:
 product_group:
 product_category:
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: all
diff --git a/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml b/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml
index c3fb808541a..2a6a56a1f5a 100644
--- a/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml
+++ b/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml
@@ -7,7 +7,7 @@ product_stage:
 product_group:
 product_category:
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: all
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 2d42796514d..f66bb2c85c9 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
@@ -4,10 +4,10 @@ name: "count_active_instance_ci_runners"
 description: Total active group Runners
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
 time_frame: all
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 49c99ce13ad..c6abe0905a4 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
@@ -4,10 +4,10 @@ name: "count_active_group_ci_runners"
 description: Total active instance Runners
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
 time_frame: all
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 0c442466199..fda2b529b30 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
@@ -4,10 +4,10 @@ name: "count_active_project_ci_runners"
 description: Total active project Runners
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
 time_frame: all
diff --git a/config/metrics/counts_all/20210502050942_ci_runners_online.yml b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
index d661767095f..201ffaeb415 100644
--- a/config/metrics/counts_all/20210502050942_ci_runners_online.yml
+++ b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
@@ -4,10 +4,10 @@ name: "counts_online_runners"
 description: Total online Runners
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
 time_frame: all
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 d5b2bb2eab8..920ec24e9e7 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
@@ -4,10 +4,10 @@ name: "count_instance_active_online_ci_runners"
 description: Total active and online instance Runners
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
 time_frame: all
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 cedf120bfc1..e88530d97c8 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
@@ -4,10 +4,10 @@ name: "count_group_active_online_ci_runners"
 description: Total active and online group Runners
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
 time_frame: all
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 dbedcc7540d..7ce3ee6ce8b 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
@@ -4,10 +4,10 @@ name: "count_project_active_online_ci_runners"
 description: Total active and online project Runners
 product_section: ops
 product_stage: verify
-product_group: group::continuous integration
+product_group: group::pipeline execution
 product_category: continuous_integration
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
 time_frame: all
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 bbfae3eb114..52dd38bab8d 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 a2cf7c6d813..65440e73542 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 85552f42431..3701f0a3ba3 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 7a1e5f28c22..70c0257481d 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 02d5ae115bb..8d8eb4630d3 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 75eafa3a54f..965efa41883 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 0a5a9ef936f..2e5bbc29d2c 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 17e677ba29d..23ed471a295 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 2bad6d31db2..992b39fbd1c 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 66080d46e7f..bd9378867e6 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 2beabb8b007..5b74bfd8d8c 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 7213c463fa9..e30f41d003a 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 dc566f03898..555c0f1e47f 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 a3cf714e5ad..23d8a6be343 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 f5215090b7e..794eaaf01c8 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 651c5426e2a..d8172d035b3 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 4be98d45ce2..f781a32cd65 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 6be928da906..a79425144ac 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 ac9ffa730f1..d84f9b6d794 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 cf51512c6eb..35a9797f2fe 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 b860b08e391..79c2b1362c0 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 c0f63cadbf2..b4e08bd5d90 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 887334c65c7..175c7171dba 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
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 6dac2db454a..d6ec214b836 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
@@ -7,7 +7,7 @@ product_stage: growth
 product_group: group::activation
 product_category: onboarding
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
 time_frame: all
diff --git a/config/metrics/counts_all/20210514141520_project_imports_total.yml b/config/metrics/counts_all/20210514141520_project_imports_total.yml
new file mode 100644
index 00000000000..cfeb30a8ca6
--- /dev/null
+++ b/config/metrics/counts_all/20210514141520_project_imports_total.yml
@@ -0,0 +1,20 @@
+---
+key_path: usage_activity_by_stage.manage.project_imports.total
+description: 'Count number of projects imported monthly'
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category:
+value_type: number
+status: implemented
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61775
+time_frame: all
+data_source: database
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
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
new file mode 100644
index 00000000000..1ec944c3d7a
--- /dev/null
+++ b/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
@@ -0,0 +1,20 @@
+---
+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_category: package_registry
+value_type: number
+status: implemented
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61014
+time_frame: all
+data_source: redis
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..f8a2b99b87e
--- /dev/null
+++ b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.in_product_marketing_email_experience_0_sent
+name: "count_sent_first_email_of_the_experience_track_for_in_product_marketing_emails"
+description: Total sent emails of the experience track's first email
+product_section:
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: data_available
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61347
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/license/20210204124827_hostname.yml b/config/metrics/license/20210204124827_hostname.yml
index 953239eff7a..40968500e13 100644
--- a/config/metrics/license/20210204124827_hostname.yml
+++ b/config/metrics/license/20210204124827_hostname.yml
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/license/20210204124829_active_user_count.yml b/config/metrics/license/20210204124829_active_user_count.yml
index 21dacb43d92..3987b6504f1 100644
--- a/config/metrics/license/20210204124829_active_user_count.yml
+++ b/config/metrics/license/20210204124829_active_user_count.yml
@@ -1,6 +1,6 @@
 ---
 key_path: active_user_count
-description: This is named the instance_user_count in the Versions application.
+description: The number of active users existing in the instance. This is named the instance_user_count in the Versions application.
 product_section: growth
 product_stage: growth
 product_group: group::product intelligence
@@ -16,4 +16,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
diff --git a/config/metrics/license/20210204124854_license_management_jobs.yml b/config/metrics/license/20210204124854_license_management_jobs.yml
deleted file mode 100644
index 81e3e17e24b..00000000000
--- a/config/metrics/license/20210204124854_license_management_jobs.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-key_path: counts.license_management_jobs
-description: Name on the GitLab license
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
-value_type: number
-status: data_available
-time_frame: none
-data_source: database
-distribution:
-- ce
-tier:
-- premium
-- ultimate
-skip_validation: true
diff --git a/config/metrics/license/20210204124926_license_trial_ends_on.yml b/config/metrics/license/20210204124926_license_trial_ends_on.yml
deleted file mode 100644
index fb9ec099a46..00000000000
--- a/config/metrics/license/20210204124926_license_trial_ends_on.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: license_trial_ends_on
-description: Date the license ends on
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
-value_type: string
-status: data_available
-time_frame: none
-data_source: system
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/license/20210216181053_version.yml b/config/metrics/license/20210216181053_version.yml
index 824167c8d97..c267c2e9bca 100644
--- a/config/metrics/license/20210216181053_version.yml
+++ b/config/metrics/license/20210216181053_version.yml
@@ -4,13 +4,15 @@ description: Identifies the version of the external registry being used
 product_section: ops
 product_stage: package
 product_group: group::package
-product_category:
-value_type: string
+product_category: container registry
+value_type: number
 status: data_available
 time_frame: none
 data_source: system
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/license/20210216183237_version.yml b/config/metrics/license/20210216183237_version.yml
index 69d97e17f20..ff501697e95 100644
--- a/config/metrics/license/20210216183237_version.yml
+++ b/config/metrics/license/20210216183237_version.yml
@@ -1,9 +1,9 @@
 ---
 key_path: git.version
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
+description: Information about Git version
+product_section: enablement
+product_stage: enablement
+product_group: group::distribution
 product_category: ''
 value_type: string
 status: data_available
@@ -11,6 +11,8 @@ time_frame: none
 data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/objects_schemas/topology_schema.json b/config/metrics/objects_schemas/topology_schema.json
index c422966c5c5..013c9496069 100644
--- a/config/metrics/objects_schemas/topology_schema.json
+++ b/config/metrics/objects_schemas/topology_schema.json
@@ -20,7 +20,7 @@
               "type": "object",
               "properties": {
                 "name":               { "type": "string", "description": "The name of the GitLab service running on this node" },
-                "server":             { "type": "string", "description": "The type of web server used (Unicorn or Puma)" },
+                "server":             { "type": "string", "description": "The type of web server used (Puma only from 14.0)" },
                 "process_count":      { "type": "number", "description": "The number of processes running for this service" },
                 "process_memory_rss": { "type": "number", "description": "The average Resident Set Size of a service process" },
                 "process_memory_uss": { "type": "number", "description": "The average Unique Set Size of a service process" },
diff --git a/config/metrics/schema.json b/config/metrics/schema.json
index e9a4a16ecd3..476e292e5c0 100644
--- a/config/metrics/schema.json
+++ b/config/metrics/schema.json
@@ -30,7 +30,7 @@
     },
     "status": {
       "type": ["string"],
-      "enum": ["data_available", "implemented", "not_used", "deprecated", "removed"]
+      "enum": ["data_available", "implemented", "not_used", "deprecated", "removed", "broken"]
     },
     "milestone": {
       "type": ["string", "null"],
@@ -43,7 +43,10 @@
     "introduced_by_url": {
       "type": ["string", "null"]
     },
-    "extra": {
+    "repair_issue_url": {
+      "type": ["string"]
+    },
+    "options": {
       "type": "object"
     },
     "time_frame": {
@@ -52,11 +55,15 @@
     },
     "data_source": {
       "type": "string",
-      "enum": ["database", "redis", "redis_hll", "prometheus", "system"]
+      "enum": ["database", "redis", "redis_hll", "prometheus", "system", "license"]
+    },
+    "data_category": {
+      "type": "string",
+      "enum": ["Operational", "Optional", "Subscription", "Standard"]
     },
     "instrumentation_class": {
       "type": "string",
-      "pattern": "^(([A-Z][a-z]+)+::)*(([A-Z][a-z]+)+)$"
+      "pattern": "^(([A-Z][a-z]+)+::)*(([A-Z]+[a-z]+)+)$"
     },
     "distribution": {
       "type": "array",
@@ -78,5 +85,17 @@
     "value_json_schema": {
       "type": "string"
     }
-  }
+  },
+  "allOf": [
+    {
+      "if": {
+        "properties": {
+          "status": { "const": "broken" }
+        }
+      },
+      "then": {
+        "required": ["repair_issue_url"]
+      }
+    }
+  ]
 }
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index d8a47a39912..5cccb84ec10 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -1,16 +1,18 @@
 ---
 key_path: container_registry_enabled
-description: Whether container registry is enabled
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+description: A count of projects where the container registry is enabled
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: container registry
 value_type: boolean
 status: data_available
 time_frame: none
 data_source: system
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
index f7aa195f284..f06b89477a4 100644
--- a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -1,16 +1,18 @@
 ---
 key_path: dependency_proxy_enabled
-description: Whether dependency proxy is enabled
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+description: A count of projects where the dependency proxy is enabled
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: container registry
 value_type: boolean
 status: data_available
 time_frame: none
 data_source: system
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index b0280347b9f..a5ae02910c6 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -1,16 +1,19 @@
 ---
 key_path: gravatar_enabled
 description: Whether gravatar is enabled
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: users
 value_type: boolean
 status: data_available
 time_frame: none
 data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
index a3c88cf976e..14303726d1f 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -1,16 +1,18 @@
 ---
 key_path: mattermost_enabled
 description: Whether Mattermost is enabled
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: boolean
 status: data_available
 time_frame: none
 data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210204124912_prometheus_enabled.yml b/config/metrics/settings/20210204124912_prometheus_enabled.yml
index 092f273e237..0e8ce856858 100644
--- a/config/metrics/settings/20210204124912_prometheus_enabled.yml
+++ b/config/metrics/settings/20210204124912_prometheus_enabled.yml
@@ -11,6 +11,8 @@ time_frame: none
 data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
index 43a13aff5e1..61b99f55452 100644
--- a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
+++ b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
@@ -11,6 +11,8 @@ time_frame: none
 data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
index 40b863cd225..ba61de920de 100644
--- a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -1,16 +1,18 @@
 ---
 key_path: reply_by_email_enabled
 description: Whether incoming email is setup
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
+product_section: dev
+product_stage: plan
+product_group: group::certify
 product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
 data_source: system
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
index bfb143d2013..80f247d9146 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -1,16 +1,18 @@
 ---
 key_path: web_ide_clientside_preview_enabled
-description: Whether web ide clientside preview is enabled
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
+description: Whether Web IDE clientside preview is enabled
+product_section: dev
+product_stage: create
+product_group: group::editor
 product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source: system
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
index f76bd0593b6..a2552d1f465 100644
--- a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -6,7 +6,8 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: boolean
-status: deprecated
+status: removed
+milestone_removed: 14.0
 time_frame: none
 data_source: system
 distribution:
diff --git a/config/metrics/settings/20210216180314_gitpod_enabled.yml b/config/metrics/settings/20210216180314_gitpod_enabled.yml
index 0bad75fe3db..72e13f785d4 100644
--- a/config/metrics/settings/20210216180314_gitpod_enabled.yml
+++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml
@@ -1,6 +1,6 @@
 ---
 key_path: gitpod_enabled
-description: Whether gitpod is enabled in the instance
+description: Whether Gitpod is enabled in the instance
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -8,7 +8,7 @@ product_category: integrations
 value_type: boolean
 status: data_available
 time_frame: none
-data_source: system
+data_source: database
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180836_enabled.yml b/config/metrics/settings/20210216180836_enabled.yml
index df71de8d4c2..c5f7e230767 100644
--- a/config/metrics/settings/20210216180836_enabled.yml
+++ b/config/metrics/settings/20210216180836_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for Artifacts
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180838_enabled.yml b/config/metrics/settings/20210216180838_enabled.yml
index 7bb1135ee08..3e5fbdf1acd 100644
--- a/config/metrics/settings/20210216180838_enabled.yml
+++ b/config/metrics/settings/20210216180838_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for Artifacts
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180840_direct_upload.yml b/config/metrics/settings/20210216180840_direct_upload.yml
index 788d101ba22..4356fe775d8 100644
--- a/config/metrics/settings/20210216180840_direct_upload.yml
+++ b/config/metrics/settings/20210216180840_direct_upload.yml
@@ -4,7 +4,7 @@ description: Whether Direct Upload for Object Storage is enabled for Artifacts
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180841_background_upload.yml b/config/metrics/settings/20210216180841_background_upload.yml
index 77788a696d0..4570a701b53 100644
--- a/config/metrics/settings/20210216180841_background_upload.yml
+++ b/config/metrics/settings/20210216180841_background_upload.yml
@@ -4,7 +4,7 @@ description: Whether Background Upload for Object Storage is enabled for Artifac
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180843_provider.yml b/config/metrics/settings/20210216180843_provider.yml
index c2d684605cb..fcaea534dab 100644
--- a/config/metrics/settings/20210216180843_provider.yml
+++ b/config/metrics/settings/20210216180843_provider.yml
@@ -4,10 +4,10 @@ description: What Object Storage provider has been configured for Artifacts
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: string
 status: data_available
-time_frame: all
+time_frame: none
 data_source: system
 distribution:
 - ce
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180845_enabled.yml b/config/metrics/settings/20210216180845_enabled.yml
index 9b5c02e3e16..dc29c7211fd 100644
--- a/config/metrics/settings/20210216180845_enabled.yml
+++ b/config/metrics/settings/20210216180845_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for External Diffs
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180847_enabled.yml b/config/metrics/settings/20210216180847_enabled.yml
index 5babfc27fbf..c5be296e19f 100644
--- a/config/metrics/settings/20210216180847_enabled.yml
+++ b/config/metrics/settings/20210216180847_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for External Diffs
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180849_direct_upload.yml b/config/metrics/settings/20210216180849_direct_upload.yml
index 56b17b7b44e..cdce6e0329c 100644
--- a/config/metrics/settings/20210216180849_direct_upload.yml
+++ b/config/metrics/settings/20210216180849_direct_upload.yml
@@ -4,7 +4,7 @@ description: Whether Direct Upload for Object Storage is enabled for External Di
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180851_background_upload.yml b/config/metrics/settings/20210216180851_background_upload.yml
index 2108d35f4bf..67852d9f039 100644
--- a/config/metrics/settings/20210216180851_background_upload.yml
+++ b/config/metrics/settings/20210216180851_background_upload.yml
@@ -5,7 +5,7 @@ description: Whether Background Upload for Object Storage is enabled for Externa
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180852_provider.yml b/config/metrics/settings/20210216180852_provider.yml
index 2d6d48d4be8..5c843969510 100644
--- a/config/metrics/settings/20210216180852_provider.yml
+++ b/config/metrics/settings/20210216180852_provider.yml
@@ -4,10 +4,10 @@ description: What Object Storage provider has been configured for External Diffs
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: string
 status: data_available
-time_frame: all
+time_frame: none
 data_source: system
 distribution:
 - ce
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180854_enabled.yml b/config/metrics/settings/20210216180854_enabled.yml
index f61f15622d7..40656fdfe2c 100644
--- a/config/metrics/settings/20210216180854_enabled.yml
+++ b/config/metrics/settings/20210216180854_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180856_enabled.yml b/config/metrics/settings/20210216180856_enabled.yml
index 1c94354afc7..1892882d5bb 100644
--- a/config/metrics/settings/20210216180856_enabled.yml
+++ b/config/metrics/settings/20210216180856_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180858_direct_upload.yml b/config/metrics/settings/20210216180858_direct_upload.yml
index acceccafa5f..f2b11a4e4a7 100644
--- a/config/metrics/settings/20210216180858_direct_upload.yml
+++ b/config/metrics/settings/20210216180858_direct_upload.yml
@@ -4,7 +4,7 @@ description: Whether Direct Upload for Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180900_background_upload.yml b/config/metrics/settings/20210216180900_background_upload.yml
index e9545888d6e..9cb4e2ed10e 100644
--- a/config/metrics/settings/20210216180900_background_upload.yml
+++ b/config/metrics/settings/20210216180900_background_upload.yml
@@ -4,7 +4,7 @@ description: Whether Background Upload for Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180902_provider.yml b/config/metrics/settings/20210216180902_provider.yml
index d275a7ea535..2e9e11b9301 100644
--- a/config/metrics/settings/20210216180902_provider.yml
+++ b/config/metrics/settings/20210216180902_provider.yml
@@ -4,10 +4,10 @@ description: What Object Storage provider has been configured for LFS
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: string
 status: data_available
-time_frame: all
+time_frame: none
 data_source: system
 distribution:
 - ce
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180903_enabled.yml b/config/metrics/settings/20210216180903_enabled.yml
index 5955ed2aa83..7c7f4f7bf57 100644
--- a/config/metrics/settings/20210216180903_enabled.yml
+++ b/config/metrics/settings/20210216180903_enabled.yml
@@ -4,10 +4,10 @@ description: Whether Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: string
 status: data_available
-time_frame: all
+time_frame: none
 data_source: system
 distribution:
 - ce
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180905_enabled.yml b/config/metrics/settings/20210216180905_enabled.yml
index 475a38bc190..fa5d70567e8 100644
--- a/config/metrics/settings/20210216180905_enabled.yml
+++ b/config/metrics/settings/20210216180905_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180907_direct_upload.yml b/config/metrics/settings/20210216180907_direct_upload.yml
index d6d8d46706b..8d2523f2e8f 100644
--- a/config/metrics/settings/20210216180907_direct_upload.yml
+++ b/config/metrics/settings/20210216180907_direct_upload.yml
@@ -4,7 +4,7 @@ description: Whether Direct Upload for Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180909_background_upload.yml b/config/metrics/settings/20210216180909_background_upload.yml
index 3f7317974c0..466c630717b 100644
--- a/config/metrics/settings/20210216180909_background_upload.yml
+++ b/config/metrics/settings/20210216180909_background_upload.yml
@@ -4,7 +4,7 @@ description: Whether Background Upload for Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180911_provider.yml b/config/metrics/settings/20210216180911_provider.yml
index 17cbafdd04a..75e5cda1f2b 100644
--- a/config/metrics/settings/20210216180911_provider.yml
+++ b/config/metrics/settings/20210216180911_provider.yml
@@ -4,10 +4,10 @@ description: What Object Storage provider has been configured for Uploads
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: string
 status: data_available
-time_frame: all
+time_frame: none
 data_source: system
 distribution:
 - ce
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
index e5b38853325..806be543ad2 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180915_enabled.yml b/config/metrics/settings/20210216180915_enabled.yml
index d1b2c7a3e91..fb16bfe1e48 100644
--- a/config/metrics/settings/20210216180915_enabled.yml
+++ b/config/metrics/settings/20210216180915_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for Packages
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180916_direct_upload.yml b/config/metrics/settings/20210216180916_direct_upload.yml
index 11c70c327b2..f743723e6c3 100644
--- a/config/metrics/settings/20210216180916_direct_upload.yml
+++ b/config/metrics/settings/20210216180916_direct_upload.yml
@@ -4,7 +4,7 @@ description: Whether Direct Upload for Object Storage is enabled for Packages
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180918_background_upload.yml b/config/metrics/settings/20210216180918_background_upload.yml
index 066fc31a62d..ede74fba29e 100644
--- a/config/metrics/settings/20210216180918_background_upload.yml
+++ b/config/metrics/settings/20210216180918_background_upload.yml
@@ -4,7 +4,7 @@ description: Whether Background Upload for Object Storage is enabled for Package
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180920_provider.yml b/config/metrics/settings/20210216180920_provider.yml
index 94f34244840..4f94e0d07bc 100644
--- a/config/metrics/settings/20210216180920_provider.yml
+++ b/config/metrics/settings/20210216180920_provider.yml
@@ -4,10 +4,10 @@ description: What Object Storage provider has been configured for Packages
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: string
 status: data_available
-time_frame: all
+time_frame: none
 data_source: system
 distribution:
 - ce
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210321224827_gitaly_apdex.yml b/config/metrics/settings/20210321224827_gitaly_apdex.yml
index 15db70b6008..8fe1e1edc0b 100644
--- a/config/metrics/settings/20210321224827_gitaly_apdex.yml
+++ b/config/metrics/settings/20210321224827_gitaly_apdex.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::gitaly
 product_category: gitaly
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47040
 time_frame: none
-- 
cgit v1.2.3