From f54056c5ce8a5d36b409cc677d689b96299ffe09 Mon Sep 17 00:00:00 2001
From: alinamihaila <amihaila@gitlab.com>
Date: Wed, 1 Sep 2021 21:05:25 +0300
Subject: [PATCH] Update milestone for metric definition

  - Use milestone <13.9 for metrics definitions
  with no milestone defined
---
 ...s_unique_visits_for_any_target_monthly.yml |   5 +-
 ...16174933_p_analytics_pipelines_monthly.yml |   5 +-
 ...174941_p_analytics_valuestream_monthly.yml |   5 +-
 ...0216174956_i_analytics_cohorts_monthly.yml |   7 +-
 ...5000_i_analytics_dev_ops_score_monthly.yml |   5 +-
 ...5004_g_analytics_merge_request_monthly.yml |   3 +-
 ..._analytics_instance_statistics_monthly.yml |   5 +-
 ..._analytics_total_unique_counts_monthly.yml |  35 +++--
 .../20210216175055_merge_requests.yml         |   1 +
 ...overriding_approvers_per_merge_request.yml |   4 +-
 ...overriding_approvers_per_merge_request.yml |   4 +-
 .../20210216175101_merge_requests_users.yml   |   1 +
 .../counts_28d/20210216175109_suggestions.yml |   4 +-
 ...216175113_merge_request_action_monthly.yml |   1 +
 ..._source_code_code_intelligence_monthly.yml |   1 +
 ...6175120_i_code_review_mr_diffs_monthly.yml |   3 +-
 ..._review_user_single_file_diffs_monthly.yml |   3 +-
 ...de_review_mr_single_file_diffs_monthly.yml |   3 +-
 ...2_i_code_review_user_create_mr_monthly.yml |   3 +-
 ...36_i_code_review_user_close_mr_monthly.yml |   3 +-
 ...0_i_code_review_user_reopen_mr_monthly.yml |   3 +-
 ...44_i_code_review_user_merge_mr_monthly.yml |   3 +-
 ..._review_user_create_mr_comment_monthly.yml |   3 +-
 ...de_review_user_edit_mr_comment_monthly.yml |   3 +-
 ..._review_user_remove_mr_comment_monthly.yml |   3 +-
 ...ode_review_user_add_suggestion_monthly.yml |   9 +-
 ...e_review_user_apply_suggestion_monthly.yml |   3 +-
 ...05_clusters_applications_cert_managers.yml |   7 +-
 ...10216175407_clusters_applications_helm.yml |   7 +-
 ...16175409_clusters_applications_ingress.yml |   7 +-
 ...16175411_clusters_applications_knative.yml |   7 +-
 ...0216175413_clusters_management_project.yml |   6 +-
 .../20210216175415_clusters_disabled.yml      |   5 +-
 .../20210216175417_clusters_enabled.yml       |   5 +-
 .../20210216175419_clusters_platforms_gke.yml |   8 +-
 .../20210216175420_clusters_platforms_eks.yml |   8 +-
 ...20210216175422_clusters_platforms_user.yml |   6 +-
 ...10216175424_instance_clusters_disabled.yml |   6 +-
 ...210216175426_instance_clusters_enabled.yml |   6 +-
 ...20210216175428_group_clusters_disabled.yml |   6 +-
 .../20210216175430_group_clusters_enabled.yml |   6 +-
 ...210216175432_project_clusters_disabled.yml |   6 +-
 ...0210216175434_project_clusters_enabled.yml |   6 +-
 .../counts_28d/20210216175542_ci_builds.yml   |   1 +
 .../20210216175544_ci_external_pipelines.yml  |   1 +
 .../20210216175546_ci_internal_pipelines.yml  |   1 +
 ...6175548_ci_pipeline_config_auto_devops.yml |   1 +
 ...16175550_ci_pipeline_config_repository.yml |   1 +
 .../20210216175552_ci_pipeline_schedules.yml  |   1 +
 .../20210216175554_ci_pipelines.yml           |   3 +-
 .../counts_28d/20210216175556_ci_triggers.yml |   1 +
 .../20210216180308_personal_snippets.yml      |   1 +
 .../20210216180310_project_snippets.yml       |   1 +
 .../counts_28d/20210216180312_snippets.yml    |   1 +
 .../counts_28d/20210216180317_snippets.yml    |   1 +
 ...tion_monthly_active_users_web_ide_edit.yml |   1 +
 ...1_action_monthly_active_users_sfe_edit.yml |   1 +
 ...nthly_active_users_snippet_editor_edit.yml |   1 +
 ...5_action_monthly_active_users_sse_edit.yml |   1 +
 ...7_action_monthly_active_users_ide_edit.yml |   1 +
 ...210216180330_g_edit_by_web_ide_monthly.yml |   1 +
 .../20210216180334_g_edit_by_sfe_monthly.yml  |   1 +
 ...16180338_g_edit_by_snippet_ide_monthly.yml |   1 +
 ...1_ide_edit_total_unique_counts_monthly.yml |   1 +
 .../20210216180424_i_search_total_monthly.yml |   1 +
 ...431_search_total_unique_counts_monthly.yml |   6 +-
 ..._management_alerts_total_unique_counts.yml |   1 +
 ...nagement_incidents_total_unique_counts.yml |   1 +
 ...20210216180524_projects_with_incidents.yml |   3 +-
 ...16180526_projects_with_alert_incidents.yml |   5 +-
 ...anagement_alert_status_changed_monthly.yml |   5 +-
 ...dent_management_alert_assigned_monthly.yml |   5 +-
 ...incident_management_alert_todo_monthly.yml |   5 +-
 ...nt_management_incident_created_monthly.yml |   5 +-
 ...t_management_incident_reopened_monthly.yml |   5 +-
 ...ent_management_incident_closed_monthly.yml |   5 +-
 ...t_management_incident_assigned_monthly.yml |   5 +-
 ...ident_management_incident_todo_monthly.yml |   5 +-
 ...nt_management_incident_comment_monthly.yml |   5 +-
 ...nagement_incident_zoom_meeting_monthly.yml |   5 +-
 ...ent_management_incident_relate_monthly.yml |   8 +-
 ...t_management_incident_unrelate_monthly.yml |   5 +-
 ...t_incident_change_confidential_monthly.yml |   5 +-
 ...management_total_unique_counts_monthly.yml |  31 ++--
 ...nagement_alert_create_incident_monthly.yml |   3 +-
 ...16180731_projects_imported_from_github.yml |   1 +
 ...monthly_active_users_design_management.yml |   1 +
 ..._action_monthly_active_users_wiki_repo.yml |   1 +
 .../counts_28d/20210216180814_events.yml      |   3 +-
 .../counts_28d/20210216180816_groups.yml      |   1 +
 .../20210216180818_users_created.yml          |   1 +
 ...180955_projects_with_prometheus_alerts.yml |   3 +-
 .../counts_28d/20210216180956_clusters.yml    |   3 +-
 ...80958_clusters_applications_prometheus.yml |   3 +-
 ...operations_dashboard_default_dashboard.yml |   3 +-
 ...16181002_projects_with_tracing_enabled.yml |   3 +-
 ...4_projects_with_error_tracking_enabled.yml |   3 +-
 ...ns_dashboard_users_with_projects_added.yml |   3 +-
 .../counts_28d/20210216181050_packages.yml    |   1 +
 .../20210216181057_projects_with_packages.yml |   1 +
 .../counts_28d/20210216181139_issues.yml      |   1 +
 .../counts_28d/20210216181141_notes.yml       |   1 +
 .../counts_28d/20210216181143_projects.yml    |   1 +
 .../counts_28d/20210216181145_todos.yml       |   1 +
 ...16181147_service_desk_enabled_projects.yml |   3 +-
 .../20210216181148_service_desk_issues.yml    |   3 +-
 .../20210216181150_projects_jira_active.yml   |   3 +-
 ...181152_projects_jira_dvcs_cloud_active.yml |   4 +-
 ...81154_projects_jira_dvcs_server_active.yml |   5 +-
 .../counts_28d/20210216181158_epics.yml       |   1 +
 .../counts_28d/20210216181200_label_lists.yml |   1 +
 ...management_issue_title_changed_monthly.yml |   3 +-
 ...ment_issue_description_changed_monthly.yml |   3 +-
 ...agement_issue_assignee_changed_monthly.yml |   3 +-
 ...gement_issue_made_confidential_monthly.yml |   3 +-
 ..._management_issue_made_visible_monthly.yml |   3 +-
 ...oject_management_issue_created_monthly.yml |   3 +-
 ...roject_management_issue_closed_monthly.yml |   3 +-
 ...ject_management_issue_reopened_monthly.yml |   3 +-
 ...management_issue_label_changed_monthly.yml |   3 +-
 ...gement_issue_milestone_changed_monthly.yml |   3 +-
 ...agement_issue_cross_referenced_monthly.yml |   3 +-
 ...project_management_issue_moved_monthly.yml |   3 +-
 ...oject_management_issue_related_monthly.yml |   3 +-
 ...ect_management_issue_unrelated_monthly.yml |   3 +-
 ...ment_issue_marked_as_duplicate_monthly.yml |   3 +-
 ...roject_management_issue_locked_monthly.yml |   3 +-
 ...ject_management_issue_unlocked_monthly.yml |   3 +-
 ...management_issue_designs_added_monthly.yml |   3 +-
 ...agement_issue_designs_modified_monthly.yml |   3 +-
 ...nagement_issue_designs_removed_monthly.yml |   3 +-
 ...agement_issue_due_date_changed_monthly.yml |   3 +-
 ...nt_issue_time_estimate_changed_monthly.yml |   3 +-
 ...ement_issue_time_spent_changed_monthly.yml |   3 +-
 ...management_issue_comment_added_monthly.yml |   3 +-
 ...anagement_issue_comment_edited_monthly.yml |   3 +-
 ...nagement_issue_comment_removed_monthly.yml |   3 +-
 ...roject_management_issue_cloned_monthly.yml |   3 +-
 ...ssues_edit_total_unique_counts_monthly.yml |  67 ++++----
 ...6181508_i_quickactions_approve_monthly.yml |   7 +-
 ...2_i_quickactions_assign_single_monthly.yml |  10 +-
 ...519_i_quickactions_assign_self_monthly.yml |   8 +-
 ...i_quickactions_assign_reviewer_monthly.yml |  10 +-
 ...216181527_i_quickactions_award_monthly.yml |   8 +-
 ...1530_i_quickactions_board_move_monthly.yml |   5 +-
 ...216181541_i_quickactions_clone_monthly.yml |   5 +-
 ...216181545_i_quickactions_close_monthly.yml |   7 +-
 ...49_i_quickactions_confidential_monthly.yml |  10 +-
 ...ns_copy_metadata_merge_request_monthly.yml |   5 +-
 ...ickactions_copy_metadata_issue_monthly.yml |   9 +-
 ...ckactions_create_merge_request_monthly.yml |  12 +-
 ...0216181604_i_quickactions_done_monthly.yml |   7 +-
 ...216181607_i_quickactions_draft_monthly.yml |   9 +-
 ...10216181611_i_quickactions_due_monthly.yml |  10 +-
 ...81615_i_quickactions_duplicate_monthly.yml |  12 +-
 ...181622_i_quickactions_estimate_monthly.yml |  12 +-
 ...216181629_i_quickactions_label_monthly.yml |   7 +-
 ...0216181633_i_quickactions_lock_monthly.yml |  11 +-
 ...216181637_i_quickactions_merge_monthly.yml |   7 +-
 ...81641_i_quickactions_milestone_monthly.yml |  11 +-
 ...0216181644_i_quickactions_move_monthly.yml |   5 +-
 ...181659_i_quickactions_reassign_monthly.yml |   7 +-
 ...quickactions_reassign_reviewer_monthly.yml |   3 +-
 ...16181707_i_quickactions_rebase_monthly.yml |  11 +-
 ...6181710_i_quickactions_relabel_monthly.yml |   9 +-
 ...16181714_i_quickactions_relate_monthly.yml |   9 +-
 ...i_quickactions_remove_due_date_monthly.yml |   7 +-
 ...i_quickactions_remove_estimate_monthly.yml |   9 +-
 ..._quickactions_remove_milestone_monthly.yml |  11 +-
 ...quickactions_remove_time_spent_monthly.yml |   5 +-
 ...747_i_quickactions_remove_zoom_monthly.yml |  13 +-
 ...16181751_i_quickactions_reopen_monthly.yml |   7 +-
 ...216181755_i_quickactions_shrug_monthly.yml |   9 +-
 ..._i_quickactions_spend_subtract_monthly.yml |  13 +-
 ...81802_i_quickactions_spend_add_monthly.yml |  11 +-
 ...6_i_quickactions_submit_review_monthly.yml |   9 +-
 ...81809_i_quickactions_subscribe_monthly.yml |  11 +-
 ...81813_i_quickactions_tableflip_monthly.yml |  13 +-
 ...10216181817_i_quickactions_tag_monthly.yml |   9 +-
 ...1_i_quickactions_target_branch_monthly.yml |   9 +-
 ...216181824_i_quickactions_title_monthly.yml |   9 +-
 ...0216181828_i_quickactions_todo_monthly.yml |  11 +-
 ...quickactions_unassign_specific_monthly.yml |   7 +-
 ...35_i_quickactions_unassign_all_monthly.yml |   5 +-
 ...quickactions_unassign_reviewer_monthly.yml |  12 +-
 ..._quickactions_unlabel_specific_monthly.yml |  10 +-
 ...846_i_quickactions_unlabel_all_monthly.yml |   7 +-
 ...16181850_i_quickactions_unlock_monthly.yml |   7 +-
 ...854_i_quickactions_unsubscribe_monthly.yml |   7 +-
 ...10216181901_i_quickactions_wip_monthly.yml |   9 +-
 ...0216181905_i_quickactions_zoom_monthly.yml |  11 +-
 .../20210216181923_successful_deployments.yml |   1 +
 .../20210216181924_failed_deployments.yml     |   1 +
 .../counts_28d/20210216181935_deployments.yml |   1 +
 .../20210216181937_failed_deployments.yml     |   1 +
 .../counts_28d/20210216181939_releases.yml    |   1 +
 .../20210216181941_successful_deployments.yml |   1 +
 ...216181951_clusters_applications_runner.yml |   3 +-
 ..._user_unique_users_all_secure_scanners.yml |   9 +-
 .../counts_28d/20210216182034_deploy_keys.yml |   1 +
 .../counts_28d/20210216182036_keys.yml        |   1 +
 .../20210216182038_remote_mirrors.yml         |   4 +-
 ...tion_monthly_active_users_project_repo.yml |   1 +
 ..._action_monthly_active_users_git_write.yml |   1 +
 .../20210216182051_protected_branches.yml     |   4 +-
 .../20210216182102_wiki_action_monthly.yml    |   1 +
 .../20210216182106_design_action_monthly.yml  |   1 +
 .../20210216182109_project_action_monthly.yml |   4 +-
 .../20210216182125_user_sast_jobs.yml         |   1 +
 ...10216182127_user_secret_detection_jobs.yml |   1 +
 .../20210216182129_sast_pipeline.yml          |   1 +
 ...210216182131_secret_detection_pipeline.yml |   1 +
 ...136_i_testing_test_case_parsed_monthly.yml |   3 +-
 ...216183159_projects_with_alerts_created.yml |   3 +-
 .../20210216183627_omniauth_providers.yml     |   1 +
 .../counts_28d/20210216183629_two-factor.yml  |   1 +
 ...210216183631_two-factor-via-u2f-device.yml |   1 +
 ...6183633_two-factor-via-webauthn-device.yml |   1 +
 .../counts_28d/20210216183634_standard.yml    |   1 +
 .../20210216183636_google_oauth2.yml          |   1 +
 ...0210216183638_unique_users_all_imports.yml |   1 +
 .../counts_28d/20210216183640_gitlab.yml      |   1 +
 .../counts_28d/20210216183642_gitlab_v1.yml   |   1 +
 .../20210216183644_gitlab_project.yml         |   1 +
 .../counts_28d/20210216183646_gitlab.yml      |   1 +
 .../counts_28d/20210216183648_github.yml      |   1 +
 .../counts_28d/20210216183650_bitbucket.yml   |   1 +
 .../20210216183652_bitbucket_server.yml       |   1 +
 .../counts_28d/20210216183653_gitea.yml       |   1 +
 .../metrics/counts_28d/20210216183655_git.yml |   1 +
 .../counts_28d/20210216183657_manifest.yml    |   1 +
 .../20210216183659_gitlab_migration.yml       |   1 +
 .../counts_28d/20210216183701_jira.yml        |   1 +
 .../counts_28d/20210216183703_fogbugz.yml     |   1 +
 .../counts_28d/20210216183705_phabricator.yml |   1 +
 .../metrics/counts_28d/20210216183707_csv.yml |   1 +
 .../20210216183709_group_import.yml           |  11 +-
 .../20210216183711_gitlab_migration.yml       |   1 +
 .../counts_28d/20210216183712_total.yml       |   1 +
 .../20210216183714_gitlab_project.yml         |   1 +
 .../counts_28d/20210216183716_gitlab.yml      |   1 +
 .../counts_28d/20210216183718_github.yml      |   1 +
 .../counts_28d/20210216183720_bitbucket.yml   |   1 +
 .../20210216183722_bitbucket_server.yml       |   1 +
 .../counts_28d/20210216183724_gitea.yml       |   1 +
 .../metrics/counts_28d/20210216183726_git.yml |   1 +
 .../counts_28d/20210216183728_manifest.yml    |   1 +
 .../counts_28d/20210216183730_jira.yml        |   1 +
 .../counts_28d/20210216183731_fogbugz.yml     |   1 +
 .../counts_28d/20210216183733_phabricator.yml |   1 +
 .../metrics/counts_28d/20210216183735_csv.yml |   1 +
 .../20210216183737_groups_imported.yml        |   1 +
 ...h_unique_visits_for_any_target_monthly.yml |  12 +-
 .../20210216184024_g_edit_by_sse_monthly.yml  |   1 +
 ...0210216184047_git_write_action_monthly.yml |   1 +
 ...40_testing_total_unique_counts_monthly.yml |  23 +--
 ...20210216184255_i_snippets_show_monthly.yml |   3 +-
 ...rraform_state_api_unique_users_monthly.yml |   3 +-
 ..._users_committing_ciconfigfile_monthly.yml |   6 +-
 ..._user_toggled_task_item_status_monthly.yml |   9 +-
 ..._i_code_review_user_approve_mr_monthly.yml |   9 +-
 ..._code_review_user_unapprove_mr_monthly.yml |   9 +-
 ...ode_review_user_resolve_thread_monthly.yml |   9 +-
 ...e_review_user_unresolve_thread_monthly.yml |   9 +-
 ...38_i_code_review_edit_mr_title_monthly.yml |   9 +-
 ...342_i_code_review_edit_mr_desc_monthly.yml |   9 +-
 ...review_user_create_review_note_monthly.yml |   6 +-
 ...ode_review_user_publish_review_monthly.yml |   6 +-
 ...er_create_multiline_mr_comment_monthly.yml |   6 +-
 ...user_edit_multiline_mr_comment_monthly.yml |   6 +-
 ...er_remove_multiline_mr_comment_monthly.yml |  12 +-
 ...18_i_code_review_user_assigned_monthly.yml |   9 +-
 ...de_review_user_marked_as_draft_monthly.yml |   9 +-
 ..._review_user_unmarked_as_draft_monthly.yml |   9 +-
 ...e_review_user_review_requested_monthly.yml |   9 +-
 ...eview_user_approval_rule_added_monthly.yml |   9 +-
 ...iew_user_approval_rule_deleted_monthly.yml |  12 +-
 ...view_user_approval_rule_edited_monthly.yml |  12 +-
 ...eview_user_vs_code_api_request_monthly.yml |   3 +-
 ...view_user_create_mr_from_issue_monthly.yml |  13 +-
 ...ode_review_total_unique_counts_monthly.yml | 113 +++++++-------
 ...templates_implicit_auto_devops_monthly.yml |   3 +-
 ...tes_implicit_auto_devops_build_monthly.yml |   3 +-
 ...es_implicit_auto_devops_deploy_monthly.yml |   3 +-
 ...mplates_implicit_security_sast_monthly.yml |   3 +-
 ...icit_security_secret_detection_monthly.yml |   3 +-
 ...templates_5_min_production_app_monthly.yml |   5 +-
 ...523_p_ci_templates_auto_devops_monthly.yml |   3 +-
 ...ci_templates_aws_cf_deploy_ec2_monthly.yml |   8 +-
 ..._p_ci_templates_aws_deploy_ecs_monthly.yml |   8 +-
 ...ci_templates_auto_devops_build_monthly.yml |   3 +-
 ...i_templates_auto_devops_deploy_monthly.yml |   3 +-
 ...ates_auto_devops_deploy_latest_monthly.yml |   3 +-
 ...6_p_ci_templates_security_sast_monthly.yml |   3 +-
 ...ates_security_secret_detection_monthly.yml |   3 +-
 ...emplates_terraform_base_latest_monthly.yml |   3 +-
 ..._templates_total_unique_counts_monthly.yml |  31 ++--
 ...ickactions_total_unique_counts_monthly.yml | 147 +++++++++---------
 ..._package_composer_deploy_token_monthly.yml |   6 +-
 ...0_i_package_conan_deploy_token_monthly.yml |   6 +-
 ...package_container_deploy_token_monthly.yml |   6 +-
 ..._i_package_debian_deploy_token_monthly.yml |   6 +-
 ...i_package_generic_deploy_token_monthly.yml |   6 +-
 ..._i_package_golang_deploy_token_monthly.yml |   6 +-
 ...0_i_package_maven_deploy_token_monthly.yml |   6 +-
 ...834_i_package_npm_deploy_token_monthly.yml |   6 +-
 ...8_i_package_nuget_deploy_token_monthly.yml |   6 +-
 ...42_i_package_pypi_deploy_token_monthly.yml |   6 +-
 ...846_i_package_tag_deploy_token_monthly.yml |   6 +-
 ...n_packages_total_unique_counts_monthly.yml |  32 ++--
 ...184854_i_package_composer_user_monthly.yml |   6 +-
 ...216184858_i_package_conan_user_monthly.yml |   3 +-
 ...84902_i_package_container_user_monthly.yml |   6 +-
 ...16184906_i_package_debian_user_monthly.yml |   6 +-
 ...6184910_i_package_generic_user_monthly.yml |   6 +-
 ...16184913_i_package_golang_user_monthly.yml |   3 +-
 ...216184917_i_package_maven_user_monthly.yml |   3 +-
 ...10216184921_i_package_npm_user_monthly.yml |   3 +-
 ...216184925_i_package_nuget_user_monthly.yml |   3 +-
 ...0216184929_i_package_pypi_user_monthly.yml |   3 +-
 ...10216184933_i_package_tag_user_monthly.yml |   3 +-
 ...r_packages_total_unique_counts_monthly.yml |  29 ++--
 ...ystem_jira_service_close_issue_monthly.yml |   3 +-
 ...m_jira_service_cross_reference_monthly.yml |   3 +-
 ..._ecosystem_total_unique_counts_monthly.yml |  27 ++--
 ...i_analytics_instance_statistics_weekly.yml |   5 +-
 ...4_analytics_total_unique_counts_weekly.yml |  37 ++---
 ...0216175111_merge_request_action_weekly.yml |   1 +
 ...i_source_code_code_intelligence_weekly.yml |   1 +
 ...16175118_i_code_review_mr_diffs_weekly.yml |   3 +-
 ...e_review_user_single_file_diffs_weekly.yml |   3 +-
 ...ode_review_mr_single_file_diffs_weekly.yml |   3 +-
 ...30_i_code_review_user_create_mr_weekly.yml |   3 +-
 ...134_i_code_review_user_close_mr_weekly.yml |   3 +-
 ...38_i_code_review_user_reopen_mr_weekly.yml |   3 +-
 ...142_i_code_review_user_merge_mr_weekly.yml |   3 +-
 ...e_review_user_create_mr_comment_weekly.yml |   7 +-
 ...ode_review_user_edit_mr_comment_weekly.yml |   3 +-
 ...e_review_user_remove_mr_comment_weekly.yml |   3 +-
 ...code_review_user_add_suggestion_weekly.yml |   9 +-
 ...de_review_user_apply_suggestion_weekly.yml |   9 +-
 ...0210216180328_g_edit_by_web_ide_weekly.yml |   1 +
 .../20210216180332_g_edit_by_sfe_weekly.yml   |   1 +
 ...216180336_g_edit_by_snippet_ide_weekly.yml |   1 +
 ...39_ide_edit_total_unique_counts_weekly.yml |   1 +
 .../20210216180422_i_search_total_weekly.yml  |   1 +
 ...0429_search_total_unique_counts_weekly.yml |   1 +
 ..._management_alerts_total_unique_counts.yml |   1 +
 ...nagement_incidents_total_unique_counts.yml |   1 +
 ...management_alert_status_changed_weekly.yml |   3 +-
 ...ident_management_alert_assigned_weekly.yml |   3 +-
 ..._incident_management_alert_todo_weekly.yml |   3 +-
 ...ent_management_incident_created_weekly.yml |   3 +-
 ...nt_management_incident_reopened_weekly.yml |   3 +-
 ...dent_management_incident_closed_weekly.yml |   3 +-
 ...nt_management_incident_assigned_weekly.yml |   3 +-
 ...cident_management_incident_todo_weekly.yml |   3 +-
 ...ent_management_incident_comment_weekly.yml |   3 +-
 ...anagement_incident_zoom_meeting_weekly.yml |   3 +-
 ...dent_management_incident_relate_weekly.yml |   6 +-
 ...nt_management_incident_unrelate_weekly.yml |   6 +-
 ...nt_incident_change_confidential_weekly.yml |   3 +-
 ..._management_total_unique_counts_weekly.yml |   3 +-
 ...anagement_alert_create_incident_weekly.yml |   1 +
 ...ement_issue_description_changed_weekly.yml |   1 +
 ...nagement_issue_assignee_changed_weekly.yml |   1 +
 ...agement_issue_made_confidential_weekly.yml |   1 +
 ...t_management_issue_made_visible_weekly.yml |   1 +
 ...roject_management_issue_created_weekly.yml |   1 +
 ...project_management_issue_closed_weekly.yml |   1 +
 ...oject_management_issue_reopened_weekly.yml |   1 +
 ..._management_issue_label_changed_weekly.yml |   1 +
 ...agement_issue_milestone_changed_weekly.yml |   1 +
 ...nagement_issue_cross_referenced_weekly.yml |   1 +
 ..._project_management_issue_moved_weekly.yml |   1 +
 ...roject_management_issue_related_weekly.yml |   1 +
 ...ject_management_issue_unrelated_weekly.yml |   1 +
 ...ement_issue_marked_as_duplicate_weekly.yml |   1 +
 ...project_management_issue_locked_weekly.yml |   1 +
 ...oject_management_issue_unlocked_weekly.yml |   1 +
 ..._management_issue_designs_added_weekly.yml |   1 +
 ...nagement_issue_designs_modified_weekly.yml |   1 +
 ...anagement_issue_designs_removed_weekly.yml |   1 +
 ...nagement_issue_due_date_changed_weekly.yml |   1 +
 ...ent_issue_time_estimate_changed_weekly.yml |   1 +
 ...gement_issue_time_spent_changed_weekly.yml |   1 +
 ..._management_issue_comment_added_weekly.yml |   1 +
 ...management_issue_comment_edited_weekly.yml |   1 +
 ...anagement_issue_comment_removed_weekly.yml |   1 +
 ...project_management_issue_cloned_weekly.yml |   1 +
 ...issues_edit_total_unique_counts_weekly.yml |   1 +
 ...16181506_i_quickactions_approve_weekly.yml |   7 +-
 ...10_i_quickactions_assign_single_weekly.yml |  11 +-
 ...1517_i_quickactions_assign_self_weekly.yml |  10 +-
 ..._i_quickactions_assign_reviewer_weekly.yml |  11 +-
 ...0216181525_i_quickactions_award_weekly.yml |   9 +-
 ...81529_i_quickactions_board_move_weekly.yml |   5 +-
 ...0216181540_i_quickactions_clone_weekly.yml |   5 +-
 ...0216181543_i_quickactions_close_weekly.yml |   7 +-
 ...547_i_quickactions_confidential_weekly.yml |  10 +-
 ...ons_copy_metadata_merge_request_weekly.yml |   6 +-
 ...uickactions_copy_metadata_issue_weekly.yml |   9 +-
 ...ickactions_create_merge_request_weekly.yml |  12 +-
 ...10216181602_i_quickactions_done_weekly.yml |   7 +-
 ...0216181605_i_quickactions_draft_weekly.yml |   9 +-
 ...210216181609_i_quickactions_due_weekly.yml |  11 +-
 ...181613_i_quickactions_duplicate_weekly.yml |  12 +-
 ...6181620_i_quickactions_estimate_weekly.yml |  14 +-
 ...0216181628_i_quickactions_label_weekly.yml |   7 +-
 ...10216181631_i_quickactions_lock_weekly.yml |  13 +-
 ...0216181635_i_quickactions_merge_weekly.yml |   7 +-
 ...181639_i_quickactions_milestone_weekly.yml |  11 +-
 ...10216181642_i_quickactions_move_weekly.yml |   5 +-
 ...6181657_i_quickactions_reassign_weekly.yml |   7 +-
 ..._quickactions_reassign_reviewer_weekly.yml |   4 +-
 ...216181705_i_quickactions_rebase_weekly.yml |  11 +-
 ...16181708_i_quickactions_relabel_weekly.yml |   9 +-
 ...216181712_i_quickactions_relate_weekly.yml |   9 +-
 ..._i_quickactions_remove_due_date_weekly.yml |   7 +-
 ..._i_quickactions_remove_estimate_weekly.yml |  11 +-
 ...i_quickactions_remove_milestone_weekly.yml |  12 +-
 ..._quickactions_remove_time_spent_weekly.yml |   5 +-
 ...1745_i_quickactions_remove_zoom_weekly.yml |  13 +-
 ...216181749_i_quickactions_reopen_weekly.yml |   7 +-
 ...0216181753_i_quickactions_shrug_weekly.yml |  10 +-
 ...6_i_quickactions_spend_subtract_weekly.yml |  11 +-
 ...181800_i_quickactions_spend_add_weekly.yml |  12 +-
 ...04_i_quickactions_submit_review_weekly.yml |   9 +-
 ...181808_i_quickactions_subscribe_weekly.yml |  12 +-
 ...181811_i_quickactions_tableflip_weekly.yml |  11 +-
 ...210216181815_i_quickactions_tag_weekly.yml |   9 +-
 ...19_i_quickactions_target_branch_weekly.yml |  11 +-
 ...0216181822_i_quickactions_title_weekly.yml |   9 +-
 ...10216181826_i_quickactions_todo_weekly.yml |  11 +-
 ..._quickactions_unassign_specific_weekly.yml |   7 +-
 ...833_i_quickactions_unassign_all_weekly.yml |   7 +-
 ..._quickactions_unassign_reviewer_weekly.yml |  12 +-
 ...i_quickactions_unlabel_specific_weekly.yml |  10 +-
 ...1845_i_quickactions_unlabel_all_weekly.yml |   8 +-
 ...216181848_i_quickactions_unlock_weekly.yml |   7 +-
 ...1852_i_quickactions_unsubscribe_weekly.yml |   7 +-
 ...210216181859_i_quickactions_wip_weekly.yml |   9 +-
 ...10216181903_i_quickactions_zoom_weekly.yml |  13 +-
 .../20210216182100_wiki_action_weekly.yml     |   1 +
 .../20210216182104_design_action_weekly.yml   |   1 +
 .../20210216182107_project_action_weekly.yml  |   4 +-
 ...2134_i_testing_test_case_parsed_weekly.yml |   1 +
 .../20210216184022_g_edit_by_sse_weekly.yml   |   1 +
 ...20210216184045_git_write_action_weekly.yml |   1 +
 .../20210216184253_i_snippets_show_weekly.yml |   3 +-
 ...e_users_committing_ciconfigfile_weekly.yml |   3 +-
 ...w_user_toggled_task_item_status_weekly.yml |   9 +-
 ...0_i_code_review_user_approve_mr_weekly.yml |   9 +-
 ...i_code_review_user_unapprove_mr_weekly.yml |   9 +-
 ...code_review_user_resolve_thread_weekly.yml |   9 +-
 ...de_review_user_unresolve_thread_weekly.yml |   9 +-
 ...336_i_code_review_edit_mr_title_weekly.yml |   9 +-
 ...4340_i_code_review_edit_mr_desc_weekly.yml |   9 +-
 ..._review_user_create_review_note_weekly.yml |   6 +-
 ...code_review_user_publish_review_weekly.yml |   6 +-
 ...ser_create_multiline_mr_comment_weekly.yml |   6 +-
 ..._user_edit_multiline_mr_comment_weekly.yml |   6 +-
 ...ser_remove_multiline_mr_comment_weekly.yml |  12 +-
 ...416_i_code_review_user_assigned_weekly.yml |   9 +-
 ...ode_review_user_marked_as_draft_weekly.yml |   9 +-
 ...e_review_user_unmarked_as_draft_weekly.yml |   9 +-
 ...de_review_user_review_requested_weekly.yml |   9 +-
 ...review_user_approval_rule_added_weekly.yml |   9 +-
 ...view_user_approval_rule_deleted_weekly.yml |  12 +-
 ...eview_user_approval_rule_edited_weekly.yml |   9 +-
 ...review_user_vs_code_api_request_weekly.yml |   9 +-
 ...eview_user_create_mr_from_issue_weekly.yml |   9 +-
 ...code_review_total_unique_counts_weekly.yml | 113 +++++++-------
 ..._templates_5_min_production_app_weekly.yml |   6 +-
 ..._ci_templates_aws_cf_deploy_ec2_weekly.yml |   8 +-
 ...8_p_ci_templates_aws_deploy_ecs_weekly.yml |   8 +-
 ...i_templates_total_unique_counts_weekly.yml |  31 ++--
 ...i_package_composer_deploy_token_weekly.yml |   6 +-
 ...08_i_package_conan_deploy_token_weekly.yml |   6 +-
 ..._package_container_deploy_token_weekly.yml |   6 +-
 ...6_i_package_debian_deploy_token_weekly.yml |   6 +-
 ..._i_package_generic_deploy_token_weekly.yml |   6 +-
 ...4_i_package_golang_deploy_token_weekly.yml |   6 +-
 ...28_i_package_maven_deploy_token_weekly.yml |   6 +-
 ...4832_i_package_npm_deploy_token_weekly.yml |   6 +-
 ...36_i_package_nuget_deploy_token_weekly.yml |   6 +-
 ...840_i_package_pypi_deploy_token_weekly.yml |   6 +-
 ...4844_i_package_tag_deploy_token_weekly.yml |   6 +-
 ...en_packages_total_unique_counts_weekly.yml |  29 ++--
 ...6184852_i_package_composer_user_weekly.yml |   6 +-
 ...0216184856_i_package_conan_user_weekly.yml |   3 +-
 ...184900_i_package_container_user_weekly.yml |   6 +-
 ...216184904_i_package_debian_user_weekly.yml |   3 +-
 ...16184908_i_package_generic_user_weekly.yml |   6 +-
 ...216184911_i_package_golang_user_weekly.yml |   3 +-
 ...0216184916_i_package_maven_user_weekly.yml |   3 +-
 ...210216184919_i_package_npm_user_weekly.yml |   3 +-
 ...0216184923_i_package_nuget_user_weekly.yml |   3 +-
 ...10216184927_i_package_pypi_user_weekly.yml |   3 +-
 ...210216184931_i_package_tag_user_weekly.yml |   6 +-
 ...er_packages_total_unique_counts_weekly.yml |  29 ++--
 ...system_jira_service_close_issue_weekly.yml |   3 +-
 ...em_jira_service_cross_reference_weekly.yml |   3 +-
 ...5_ecosystem_total_unique_counts_weekly.yml |  27 ++--
 .../counts_all/20210204124930_servers.yml     |   1 +
 .../counts_all/20210204124932_clusters.yml    |   1 +
 .../20210216174832_cycle_analytics_views.yml  |   3 +-
 .../20210216174846_p_analytics_pipelines.yml  |   1 +
 ...20210216174850_p_analytics_valuestream.yml |   1 +
 .../20210216174856_p_analytics_repo.yml       |   1 +
 .../20210216174858_i_analytics_cohorts.yml    |   1 +
 ...210216174900_i_analytics_dev_ops_score.yml |   1 +
 ...210216174902_g_analytics_merge_request.yml |   4 +-
 ...174906_i_analytics_instance_statistics.yml |   1 +
 ...analytics_unique_visits_for_any_target.yml |   5 +-
 ...175019_projects_with_prometheus_alerts.yml |   1 +
 .../20210216175021_pod_logs_usages_total.yml  |   1 +
 ...16175024_service_desk_enabled_projects.yml |   1 +
 .../20210216175026_service_desk_issues.yml    |   1 +
 .../counts_all/20210216175037_suggestions.yml |   1 +
 .../20210216175039_merge_requests.yml         |   1 +
 .../20210216175041_merge_request_comment.yml  |   1 +
 .../20210216175043_merge_request_create.yml   |   1 +
 .../20210216175045_merge_requests.yml         |   1 +
 .../counts_all/20210216175053_suggestions.yml |   1 +
 ...ed_merge_requests_using_approval_rules.yml |   1 +
 .../20210216175229_auto_devops_enabled.yml    |   4 +-
 .../20210216175231_auto_devops_disabled.yml   |   3 +-
 .../counts_all/20210216175232_clusters.yml    |   3 +-
 .../20210216175234_clusters_enabled.yml       |   1 +
 ...0210216175236_project_clusters_enabled.yml |   3 +-
 .../20210216175238_group_clusters_enabled.yml |   3 +-
 ...210216175240_instance_clusters_enabled.yml |   3 +-
 .../20210216175242_clusters_disabled.yml      |   1 +
 ...210216175244_project_clusters_disabled.yml |   3 +-
 ...20210216175246_group_clusters_disabled.yml |   3 +-
 ...10216175248_instance_clusters_disabled.yml |   3 +-
 .../20210216175250_clusters_platforms_eks.yml |   3 +-
 .../20210216175251_clusters_platforms_gke.yml |   3 +-
 ...20210216175253_clusters_platforms_user.yml |   3 +-
 ...10216175255_clusters_applications_helm.yml |   3 +-
 ...16175257_clusters_applications_ingress.yml |   3 +-
 ...59_clusters_applications_cert_managers.yml |   3 +-
 ...75301_clusters_applications_crossplane.yml |   3 +-
 ...75303_clusters_applications_prometheus.yml |   3 +-
 ...216175305_clusters_applications_runner.yml |   1 +
 ...16175307_clusters_applications_knative.yml |   3 +-
 ...09_clusters_applications_elastic_stack.yml |   3 +-
 ...16175310_clusters_applications_jupyter.yml |   3 +-
 ...216175312_clusters_applications_cilium.yml |   3 +-
 ...0216175314_clusters_management_project.yml |   3 +-
 ...175320_projects_with_terraform_reports.yml |   1 +
 ...6175322_projects_with_terraform_states.yml |   1 +
 .../20210216175324_terraform_reports.yml      |   3 +-
 .../20210216175326_terraform_states.yml       |   1 +
 ...29_clusters_applications_cert_managers.yml |   1 +
 ...10216175331_clusters_applications_helm.yml |   1 +
 ...16175333_clusters_applications_ingress.yml |   1 +
 ...16175335_clusters_applications_knative.yml |   1 +
 ...0216175337_clusters_management_project.yml |   1 +
 .../20210216175339_clusters_disabled.yml      |   1 +
 .../20210216175341_clusters_enabled.yml       |   1 +
 .../20210216175343_clusters_platforms_gke.yml |   1 +
 .../20210216175345_clusters_platforms_eks.yml |   1 +
 ...20210216175346_clusters_platforms_user.yml |   1 +
 ...10216175348_instance_clusters_disabled.yml |   1 +
 ...210216175350_instance_clusters_enabled.yml |   1 +
 ...20210216175352_group_clusters_disabled.yml |   1 +
 .../20210216175354_group_clusters_enabled.yml |   1 +
 ...210216175356_project_clusters_disabled.yml |   1 +
 ...0210216175358_project_clusters_enabled.yml |   1 +
 ...175403_projects_with_prometheus_alerts.yml |   1 +
 ..._ingress_modsecurity_packets_processed.yml |   1 +
 ..._ingress_modsecurity_packets_anomalous.yml |   1 +
 ...20210216175446_network_policy_forwards.yml |   1 +
 .../20210216175448_network_policy_drops.yml   |   1 +
 ...0216175450_ingress_modsecurity_logging.yml |   1 +
 ...216175452_ingress_modsecurity_blocking.yml |   1 +
 ...216175454_ingress_modsecurity_disabled.yml |   1 +
 ...5456_ingress_modsecurity_not_installed.yml |   1 +
 .../counts_all/20210216175510_ci_builds.yml   |   1 +
 .../20210216175512_ci_internal_pipelines.yml  |   1 +
 .../20210216175514_ci_external_pipelines.yml  |   1 +
 ...6175516_ci_pipeline_config_auto_devops.yml |   1 +
 ...16175518_ci_pipeline_config_repository.yml |   1 +
 .../counts_all/20210216175520_ci_runners.yml  |   1 +
 .../counts_all/20210216175521_ci_triggers.yml |   1 +
 .../20210216175523_ci_pipeline_schedules.yml  |   1 +
 .../counts_all/20210216175525_ci_builds.yml   |   1 +
 .../20210216175527_ci_external_pipelines.yml  |   1 +
 .../20210216175529_ci_internal_pipelines.yml  |   1 +
 ...6175531_ci_pipeline_config_auto_devops.yml |   1 +
 ...16175533_ci_pipeline_config_repository.yml |   2 +-
 .../20210216175535_ci_pipeline_schedules.yml  |   1 +
 .../20210216175537_ci_pipelines.yml           |   1 +
 .../counts_all/20210216175539_ci_triggers.yml |   1 +
 .../counts_all/20210216175621_web_hooks.yml   |   5 +-
 .../20210216175623_projects_asana_active.yml  |   1 +
 .../20210216175625_groups_asana_active.yml    |   1 +
 .../20210216175627_templates_asana_active.yml |   1 +
 .../20210216175628_instances_asana_active.yml |   1 +
 ...75630_projects_inheriting_asana_active.yml |   1 +
 ...6175632_groups_inheriting_asana_active.yml |   1 +
 ...0210216175634_projects_assembla_active.yml |   1 +
 .../20210216175636_groups_assembla_active.yml |   1 +
 ...210216175638_templates_assembla_active.yml |   1 +
 ...210216175640_instances_assembla_active.yml |   1 +
 ...42_projects_inheriting_assembla_active.yml |   1 +
 ...5644_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 +
 ...5653_projects_inheriting_bamboo_active.yml |   1 +
 ...175655_groups_inheriting_bamboo_active.yml |   1 +
 ...0210216175657_projects_bugzilla_active.yml |   1 +
 .../20210216175659_groups_bugzilla_active.yml |   1 +
 ...210216175701_templates_bugzilla_active.yml |   1 +
 ...210216175702_instances_bugzilla_active.yml |   1 +
 ...04_projects_inheriting_bugzilla_active.yml |   1 +
 ...5706_groups_inheriting_bugzilla_active.yml |   1 +
 ...210216175708_projects_buildkite_active.yml |   1 +
 ...20210216175710_groups_buildkite_active.yml |   1 +
 ...10216175712_templates_buildkite_active.yml |   1 +
 ...10216175714_instances_buildkite_active.yml |   1 +
 ...6_projects_inheriting_buildkite_active.yml |   1 +
 ...717_groups_inheriting_buildkite_active.yml |   1 +
 ...0210216175719_projects_campfire_active.yml |   1 +
 .../20210216175721_groups_campfire_active.yml |   1 +
 ...210216175723_templates_campfire_active.yml |   1 +
 ...210216175725_instances_campfire_active.yml |   1 +
 ...27_projects_inheriting_campfire_active.yml |   1 +
 ...5729_groups_inheriting_campfire_active.yml |   1 +
 ...10216175731_projects_confluence_active.yml |   1 +
 ...0210216175733_groups_confluence_active.yml |   1 +
 ...0216175734_templates_confluence_active.yml |   1 +
 ...0216175736_instances_confluence_active.yml |   1 +
 ..._projects_inheriting_confluence_active.yml |   1 +
 ...40_groups_inheriting_confluence_active.yml |   1 +
 ...2_projects_custom_issue_tracker_active.yml |   1 +
 ...744_groups_custom_issue_tracker_active.yml |   1 +
 ..._templates_custom_issue_tracker_active.yml |   1 +
 ..._instances_custom_issue_tracker_active.yml |   1 +
 ...inheriting_custom_issue_tracker_active.yml |   1 +
 ...inheriting_custom_issue_tracker_active.yml |   1 +
 ...20210216175753_projects_discord_active.yml |   1 +
 .../20210216175755_groups_discord_active.yml  |   1 +
 ...0210216175756_templates_discord_active.yml |   1 +
 ...0210216175758_instances_discord_active.yml |   1 +
 ...800_projects_inheriting_discord_active.yml |   1 +
 ...75802_groups_inheriting_discord_active.yml |   1 +
 ...0210216175804_projects_drone_ci_active.yml |   1 +
 .../20210216175806_groups_drone_ci_active.yml |   1 +
 ...210216175807_templates_drone_ci_active.yml |   1 +
 ...210216175809_instances_drone_ci_active.yml |   1 +
 ...11_projects_inheriting_drone_ci_active.yml |   1 +
 ...5813_groups_inheriting_drone_ci_active.yml |   1 +
 ...6175815_projects_emails_on_push_active.yml |   1 +
 ...216175817_groups_emails_on_push_active.yml |   1 +
 ...175818_templates_emails_on_push_active.yml |   1 +
 ...175820_instances_emails_on_push_active.yml |   1 +
 ...jects_inheriting_emails_on_push_active.yml |   1 +
 ...roups_inheriting_emails_on_push_active.yml |   1 +
 ...16175826_projects_external_wiki_active.yml |   1 +
 ...0216175828_groups_external_wiki_active.yml |   1 +
 ...6175829_templates_external_wiki_active.yml |   1 +
 ...6175831_instances_external_wiki_active.yml |   1 +
 ...ojects_inheriting_external_wiki_active.yml |   1 +
 ...groups_inheriting_external_wiki_active.yml |   1 +
 ...0210216175837_projects_flowdock_active.yml |   1 +
 .../20210216175839_groups_flowdock_active.yml |   1 +
 ...210216175840_templates_flowdock_active.yml |   1 +
 ...210216175842_instances_flowdock_active.yml |   1 +
 ...44_projects_inheriting_flowdock_active.yml |   1 +
 ...5846_groups_inheriting_flowdock_active.yml |   1 +
 ...16175859_projects_hangouts_chat_active.yml |   1 +
 ...0216175901_groups_hangouts_chat_active.yml |   1 +
 ...6175902_templates_hangouts_chat_active.yml |   1 +
 ...6175904_instances_hangouts_chat_active.yml |   1 +
 ...ojects_inheriting_hangouts_chat_active.yml |   1 +
 ...groups_inheriting_hangouts_chat_active.yml |   1 +
 ...20210216175910_projects_hipchat_active.yml |   1 +
 .../20210216175912_groups_hipchat_active.yml  |   1 +
 ...0210216175913_templates_hipchat_active.yml |   1 +
 ...0210216175915_instances_hipchat_active.yml |   1 +
 ...917_projects_inheriting_hipchat_active.yml |   1 +
 ...75919_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 +
 ...75928_projects_inheriting_irker_active.yml |   1 +
 ...6175930_groups_inheriting_irker_active.yml |   1 +
 ...20210216175932_projects_jenkins_active.yml |   1 +
 .../20210216175934_groups_jenkins_active.yml  |   1 +
 ...0210216175935_templates_jenkins_active.yml |   1 +
 ...0210216175937_instances_jenkins_active.yml |   1 +
 ...939_projects_inheriting_jenkins_active.yml |   1 +
 ...75941_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 +
 ...175950_projects_inheriting_jira_active.yml |   1 +
 ...16175952_groups_inheriting_jira_active.yml |   1 +
 ...10216175954_projects_mattermost_active.yml |   1 +
 ...0210216175956_groups_mattermost_active.yml |   1 +
 ...0216175957_templates_mattermost_active.yml |   1 +
 ...0216175959_instances_mattermost_active.yml |   1 +
 ..._projects_inheriting_mattermost_active.yml |   1 +
 ...03_groups_inheriting_mattermost_active.yml |   1 +
 ...jects_mattermost_slash_commands_active.yml |   1 +
 ...roups_mattermost_slash_commands_active.yml |   1 +
 ...lates_mattermost_slash_commands_active.yml |   1 +
 ...ances_mattermost_slash_commands_active.yml |   1 +
 ...iting_mattermost_slash_commands_active.yml |   1 +
 ...iting_mattermost_slash_commands_active.yml |   1 +
 ...180016_projects_microsoft_teams_active.yml |   1 +
 ...16180018_groups_microsoft_teams_active.yml |   1 +
 ...80019_templates_microsoft_teams_active.yml |   1 +
 ...80021_instances_microsoft_teams_active.yml |   1 +
 ...ects_inheriting_microsoft_teams_active.yml |   1 +
 ...oups_inheriting_microsoft_teams_active.yml |   1 +
 ...210216180027_projects_packagist_active.yml |   1 +
 ...20210216180029_groups_packagist_active.yml |   1 +
 ...10216180030_templates_packagist_active.yml |   1 +
 ...10216180032_instances_packagist_active.yml |   1 +
 ...4_projects_inheriting_packagist_active.yml |   1 +
 ...036_groups_inheriting_packagist_active.yml |   1 +
 ...180038_projects_pipelines_email_active.yml |   1 +
 ...16180040_groups_pipelines_email_active.yml |   1 +
 ...80041_templates_pipelines_email_active.yml |   1 +
 ...80043_instances_pipelines_email_active.yml |   1 +
 ...ects_inheriting_pipelines_email_active.yml |   1 +
 ...oups_inheriting_pipelines_email_active.yml |   1 +
 ...6180049_projects_pivotaltracker_active.yml |   1 +
 ...216180051_groups_pivotaltracker_active.yml |   1 +
 ...180052_templates_pivotaltracker_active.yml |   1 +
 ...180054_instances_pivotaltracker_active.yml |   1 +
 ...jects_inheriting_pivotaltracker_active.yml |   1 +
 ...roups_inheriting_pivotaltracker_active.yml |   1 +
 ...0210216180100_projects_pushover_active.yml |   1 +
 .../20210216180102_groups_pushover_active.yml |   1 +
 ...210216180104_templates_pushover_active.yml |   1 +
 ...210216180105_instances_pushover_active.yml |   1 +
 ...07_projects_inheriting_pushover_active.yml |   1 +
 ...0109_groups_inheriting_pushover_active.yml |   1 +
 ...20210216180111_projects_redmine_active.yml |   1 +
 .../20210216180113_groups_redmine_active.yml  |   1 +
 ...0210216180115_templates_redmine_active.yml |   1 +
 ...0210216180116_instances_redmine_active.yml |   1 +
 ...118_projects_inheriting_redmine_active.yml |   1 +
 ...80120_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 +
 ...80129_projects_inheriting_slack_active.yml |   1 +
 ...6180131_groups_inheriting_slack_active.yml |   1 +
 ...3_projects_slack_slash_commands_active.yml |   1 +
 ...135_groups_slack_slash_commands_active.yml |   1 +
 ..._templates_slack_slash_commands_active.yml |   1 +
 ..._instances_slack_slash_commands_active.yml |   1 +
 ...inheriting_slack_slash_commands_active.yml |   1 +
 ...inheriting_slack_slash_commands_active.yml |   1 +
 ...0210216180144_projects_teamcity_active.yml |   1 +
 .../20210216180146_groups_teamcity_active.yml |   1 +
 ...210216180148_templates_teamcity_active.yml |   1 +
 ...210216180149_instances_teamcity_active.yml |   1 +
 ...51_projects_inheriting_teamcity_active.yml |   1 +
 ...0153_groups_inheriting_teamcity_active.yml |   1 +
 ...16180155_projects_unify_circuit_active.yml |   1 +
 ...0216180157_groups_unify_circuit_active.yml |   1 +
 ...6180159_templates_unify_circuit_active.yml |   1 +
 ...6180201_instances_unify_circuit_active.yml |   1 +
 ...ojects_inheriting_unify_circuit_active.yml |   1 +
 ...groups_inheriting_unify_circuit_active.yml |   1 +
 ...0216180206_projects_webex_teams_active.yml |   1 +
 ...210216180208_groups_webex_teams_active.yml |   1 +
 ...216180210_templates_webex_teams_active.yml |   1 +
 ...216180212_instances_webex_teams_active.yml |   1 +
 ...projects_inheriting_webex_teams_active.yml |   1 +
 ...5_groups_inheriting_webex_teams_active.yml |   1 +
 ...0210216180217_projects_youtrack_active.yml |   1 +
 .../20210216180219_groups_youtrack_active.yml |   1 +
 ...210216180221_templates_youtrack_active.yml |   1 +
 ...210216180223_instances_youtrack_active.yml |   1 +
 ...25_projects_inheriting_youtrack_active.yml |   1 +
 ...0226_groups_inheriting_youtrack_active.yml |   1 +
 ...0216180228_projects_jira_server_active.yml |   1 +
 ...10216180230_projects_jira_cloud_active.yml |   1 +
 ...180232_projects_jira_dvcs_cloud_active.yml |   1 +
 ...80234_projects_jira_dvcs_server_active.yml |   1 +
 .../20210216180239_personal_snippets.yml      |   1 +
 .../20210216180241_project_snippets.yml       |   1 +
 .../20210216180242_web_ide_commits.yml        |   1 +
 .../20210216180244_web_ide_views.yml          |   1 +
 .../20210216180246_web_ide_merge_requests.yml |   1 +
 .../20210216180248_web_ide_previews.yml       |   1 +
 .../20210216180250_web_ide_terminals.yml      |   1 +
 .../20210216180252_web_ide_pipelines.yml      |   1 +
 .../20210216180253_snippet_comment.yml        |   1 +
 .../20210216180255_snippet_create.yml         |   1 +
 .../20210216180257_snippet_update.yml         |   1 +
 ...0210216180259_static_site_editor_views.yml |   1 +
 ...10216180301_static_site_editor_commits.yml |   1 +
 ...0303_static_site_editor_merge_requests.yml |   1 +
 ...4_user_preferences_user_gitpod_enabled.yml |   1 +
 .../counts_all/20210216180306_snippets.yml    |   1 +
 .../counts_all/20210216180316_snippets.yml    |   1 +
 .../20210216180410_pool_repositories.yml      |   1 +
 .../20210216180413_all_searches.yml           |   1 +
 .../20210216180414_navbar_searches.yml        |   4 +-
 .../20210216180416_i_search_total.yml         |   1 +
 ..._created_from_gitlab_error_tracking_ui.yml |   1 +
 ...80436_issues_with_associated_zoom_link.yml |   1 +
 ...180438_issues_using_zoom_quick_actions.yml |   1 +
 ...es_with_embedded_grafana_charts_approx.yml |   1 +
 ...10216180441_issues_created_from_alerts.yml |   1 +
 ...216180443_issues_created_gitlab_alerts.yml |   1 +
 ...45_issues_created_manually_from_alerts.yml |   1 +
 .../20210216180447_incident_issues.yml        |   1 +
 ...210216180449_alert_bot_incident_issues.yml |   1 +
 ...20210216180451_incident_labeled_issues.yml |   1 +
 ...0216180453_projects_creating_incidents.yml |   1 +
 ...4_projects_with_error_tracking_enabled.yml |   1 +
 ...6_projects_with_alerts_service_enabled.yml |   1 +
 ...216180458_projects_with_alerts_created.yml |   1 +
 ...ojects_with_enabled_alert_integrations.yml |   1 +
 ...7_projects_with_error_tracking_enabled.yml |   1 +
 ...20210216180518_projects_with_incidents.yml |   1 +
 ...16180520_projects_with_alert_incidents.yml |   1 +
 ...16180628_projects_imported_from_github.yml |   1 +
 ...16180630_projects_imported_from_github.yml |   1 +
 ...0210216180632_unique_users_all_imports.yml |   1 +
 .../counts_all/20210216180634_gitlab.yml      |   1 +
 .../counts_all/20210216180636_gitlab_v1.yml   |   1 +
 .../20210216180638_gitlab_project.yml         |   1 +
 .../counts_all/20210216180639_gitlab.yml      |   1 +
 .../counts_all/20210216180641_github.yml      |   1 +
 .../counts_all/20210216180643_bitbucket.yml   |   1 +
 .../20210216180645_bitbucket_server.yml       |   1 +
 .../counts_all/20210216180647_gitea.yml       |   1 +
 .../metrics/counts_all/20210216180649_git.yml |   1 +
 .../counts_all/20210216180650_manifest.yml    |   1 +
 .../20210216180652_gitlab_migration.yml       |   1 +
 .../counts_all/20210216180654_jira.yml        |   1 +
 .../counts_all/20210216180656_fogbugz.yml     |   1 +
 .../counts_all/20210216180658_phabricator.yml |   1 +
 .../metrics/counts_all/20210216180700_csv.yml |   1 +
 .../20210216180702_group_import.yml           |   1 +
 .../20210216180703_gitlab_migration.yml       |   1 +
 .../counts_all/20210216180705_total.yml       |   1 +
 .../20210216180707_gitlab_project.yml         |   3 +-
 .../counts_all/20210216180709_gitlab.yml      |   3 +-
 .../counts_all/20210216180711_github.yml      |   1 +
 .../counts_all/20210216180713_bitbucket.yml   |   3 +-
 .../20210216180715_bitbucket_server.yml       |   3 +-
 .../counts_all/20210216180716_gitea.yml       |   3 +-
 .../metrics/counts_all/20210216180718_git.yml |   3 +-
 .../counts_all/20210216180720_manifest.yml    |   3 +-
 .../counts_all/20210216180722_jira.yml        |   1 +
 .../counts_all/20210216180724_fogbugz.yml     |   3 +-
 .../counts_all/20210216180726_phabricator.yml |   1 +
 .../metrics/counts_all/20210216180727_csv.yml |   1 +
 .../20210216180729_groups_imported.yml        |   1 +
 .../20210216180734_wiki_pages_create.yml      |   1 +
 .../20210216180736_wiki_pages_update.yml      |   1 +
 .../20210216180738_wiki_pages_delete.yml      |   1 +
 ...80740_design_management_designs_create.yml |   1 +
 ...80741_design_management_designs_update.yml |   1 +
 ...80743_design_management_designs_delete.yml |   1 +
 .../counts_all/20210216180750_groups.yml      |   1 +
 .../counts_all/20210216180752_keys.yml        |   1 +
 .../counts_all/20210216180754_events.yml      |   1 +
 .../counts_all/20210216180756_groups.yml      |   1 +
 .../20210216180758_users_created.yml          |   1 +
 ...0216180927_grafana_integrated_projects.yml |   3 +-
 ...16180929_projects_with_tracing_enabled.yml |   3 +-
 ...10216180931_projects_prometheus_active.yml |   3 +-
 ...0210216180933_groups_prometheus_active.yml |   3 +-
 ...0216180934_templates_prometheus_active.yml |   3 +-
 ...0216180936_instances_prometheus_active.yml |   3 +-
 ..._projects_inheriting_prometheus_active.yml |   3 +-
 ...40_groups_inheriting_prometheus_active.yml |   3 +-
 ...operations_dashboard_default_dashboard.yml |   3 +-
 ...ns_dashboard_users_with_projects_added.yml |   3 +-
 .../counts_all/20210216180945_clusters.yml    |  11 +-
 ...80947_clusters_applications_prometheus.yml |  11 +-
 ...operations_dashboard_default_dashboard.yml |   9 +-
 ...16180951_projects_with_tracing_enabled.yml |  11 +-
 ...ns_dashboard_users_with_projects_added.yml |  11 +-
 .../counts_all/20210216181009_lfs_objects.yml |   5 +-
 .../20210216181011_projects_with_packages.yml |   1 +
 .../counts_all/20210216181012_packages.yml    |   1 +
 ...ojects_with_expiration_policy_disabled.yml |   1 +
 ...rojects_with_expiration_policy_enabled.yml |   1 +
 ...on_policy_enabled_with_keep_n_set_to_1.yml |   1 +
 ...on_policy_enabled_with_keep_n_set_to_5.yml |   1 +
 ...n_policy_enabled_with_keep_n_set_to_10.yml |   1 +
 ...n_policy_enabled_with_keep_n_set_to_25.yml |   1 +
 ...n_policy_enabled_with_keep_n_set_to_50.yml |   1 +
 ..._policy_enabled_with_keep_n_set_to_100.yml |   1 +
 ..._policy_enabled_with_cadence_set_to_1d.yml |   1 +
 ..._policy_enabled_with_cadence_set_to_7d.yml |   1 +
 ...policy_enabled_with_cadence_set_to_14d.yml |   1 +
 ...icy_enabled_with_cadence_set_to_1month.yml |   1 +
 ...icy_enabled_with_cadence_set_to_3month.yml |   1 +
 ...licy_enabled_with_older_than_set_to_7d.yml |   4 +-
 ...icy_enabled_with_older_than_set_to_14d.yml |   4 +-
 ...icy_enabled_with_older_than_set_to_30d.yml |   4 +-
 ...icy_enabled_with_older_than_set_to_90d.yml |   4 +-
 ...ation_policy_enabled_with_keep_n_unset.yml |   4 +-
 ...n_policy_enabled_with_older_than_unset.yml |   4 +-
 .../counts_all/20210216181051_vendor.yml      |   4 +-
 .../20210216181055_projects_with_packages.yml |   1 +
 .../counts_all/20210216181102_issues.yml      |   1 +
 .../counts_all/20210216181104_label_lists.yml |   1 +
 .../counts_all/20210216181108_milestones.yml  |   1 +
 .../counts_all/20210216181109_uploads.yml     |   1 +
 .../counts_all/20210216181111_labels.yml      |   1 +
 .../counts_all/20210216181113_notes.yml       |   1 +
 .../counts_all/20210216181115_issues.yml      |   1 +
 .../counts_all/20210216181117_notes.yml       |   1 +
 .../counts_all/20210216181119_projects.yml    |   1 +
 .../counts_all/20210216181121_todos.yml       |   1 +
 ...16181122_service_desk_enabled_projects.yml |   1 +
 .../20210216181124_service_desk_issues.yml    |   1 +
 .../20210216181126_projects_jira_active.yml   |   1 +
 ...181128_projects_jira_dvcs_cloud_active.yml |   4 +-
 ...81130_projects_jira_dvcs_server_active.yml |   4 +-
 .../counts_all/20210216181134_epics.yml       |   1 +
 .../counts_all/20210216181135_label_lists.yml |   1 +
 .../20210216181249_feature_flags.yml          |   1 +
 .../counts_all/20210216181252_boards.yml      |   1 +
 .../counts_all/20210216181254_projects.yml    |   1 +
 .../counts_all/20210216181256_todos.yml       |   1 +
 ...1258_jira_imports_total_imported_count.yml |   1 +
 ...0216181259_jira_imports_projects_count.yml |   1 +
 ...ra_imports_total_imported_issues_count.yml |   1 +
 .../counts_all/20210216181908_deploy_keys.yml |   1 +
 .../20210216181911_successful_deployments.yml |   1 +
 .../20210216181912_failed_deployments.yml     |   1 +
 .../20210216181914_environments.yml           |   1 +
 .../20210216181916_in_review_folder.yml       |   1 +
 .../counts_all/20210216181918_releases.yml    |   1 +
 .../counts_all/20210216181926_deployments.yml |   1 +
 .../20210216181928_failed_deployments.yml     |   1 +
 .../counts_all/20210216181930_releases.yml    |   1 +
 .../20210216181932_successful_deployments.yml |   1 +
 .../20210216181946_pages_domains.yml          |   1 +
 ...216181949_clusters_applications_runner.yml |   3 +-
 ..._user_unique_users_all_secure_scanners.yml |   1 +
 .../20210216182002_remote_mirrors.yml         |   1 +
 .../20210216182004_commit_comment.yml         |   1 +
 .../20210216182006_source_code_pushes.yml     |   1 +
 .../counts_all/20210216182010_deploy_keys.yml |   1 +
 .../counts_all/20210216182012_keys.yml        |   1 +
 ...overriding_approvers_per_merge_request.yml |   4 +-
 ...overriding_approvers_per_merge_request.yml |   4 +-
 .../20210216182017_remote_mirrors.yml         |   1 +
 .../counts_all/20210216182112_sast_jobs.yml   |   1 +
 .../20210216182114_secret_detection_jobs.yml  |   1 +
 .../20210216182116_user_sast_jobs.yml         |   1 +
 ...10216182118_user_secret_detection_jobs.yml |   1 +
 ...2454_protected_branches_except_default.yml |   1 +
 ...20210216182547_projects_datadog_active.yml |   3 +-
 .../20210216182549_groups_datadog_active.yml  |   1 +
 ...0210216182551_templates_datadog_active.yml |   1 +
 ...0210216182553_instances_datadog_active.yml |   1 +
 ...555_projects_inheriting_datadog_active.yml |   1 +
 ...82557_groups_inheriting_datadog_active.yml |   1 +
 .../20210216182614_projects_ewm_active.yml    |   3 +-
 .../20210216182616_groups_ewm_active.yml      |   1 +
 .../20210216182618_templates_ewm_active.yml   |   1 +
 .../20210216182620_instances_ewm_active.yml   |   1 +
 ...6182622_projects_inheriting_ewm_active.yml |   1 +
 ...216182623_groups_inheriting_ewm_active.yml |   1 +
 ...20210216182722_projects_mock_ci_active.yml |   1 +
 .../20210216182724_groups_mock_ci_active.yml  |   1 +
 ...0210216182726_templates_mock_ci_active.yml |   1 +
 ...0210216182728_instances_mock_ci_active.yml |   1 +
 ...730_projects_inheriting_mock_ci_active.yml |   1 +
 ...82732_groups_inheriting_mock_ci_active.yml |   1 +
 ...182734_projects_mock_monitoring_active.yml |   1 +
 ...16182736_groups_mock_monitoring_active.yml |   1 +
 ...82738_templates_mock_monitoring_active.yml |   1 +
 ...82739_instances_mock_monitoring_active.yml |   1 +
 ...ects_inheriting_mock_monitoring_active.yml |   1 +
 ...oups_inheriting_mock_monitoring_active.yml |   1 +
 ...ents_i_package_composer_delete_package.yml |   1 +
 ...events_i_package_composer_pull_package.yml |   1 +
 ...events_i_package_composer_push_package.yml |   1 +
 ..._events_i_package_conan_delete_package.yml |   1 +
 ...ge_events_i_package_conan_pull_package.yml |   1 +
 ...ge_events_i_package_conan_push_package.yml |   1 +
 ...nts_i_package_container_delete_package.yml |   1 +
 ...vents_i_package_container_pull_package.yml |   1 +
 ...vents_i_package_container_push_package.yml |   1 +
 ...events_i_package_debian_delete_package.yml |   1 +
 ...e_events_i_package_debian_pull_package.yml |   1 +
 ...e_events_i_package_debian_push_package.yml |   1 +
 ...ackage_events_i_package_delete_package.yml |   1 +
 ...package_delete_package_by_deploy_token.yml |   1 +
 ...ents_i_package_delete_package_by_guest.yml |   1 +
 ...vents_i_package_delete_package_by_user.yml |   1 +
 ...vents_i_package_generic_delete_package.yml |   1 +
 ..._events_i_package_generic_pull_package.yml |   1 +
 ..._events_i_package_generic_push_package.yml |   1 +
 ...events_i_package_golang_delete_package.yml |   1 +
 ...e_events_i_package_golang_pull_package.yml |   1 +
 ...e_events_i_package_golang_push_package.yml |   1 +
 ..._events_i_package_maven_delete_package.yml |   1 +
 ...ge_events_i_package_maven_pull_package.yml |   1 +
 ...ge_events_i_package_maven_push_package.yml |   1 +
 ...ge_events_i_package_npm_delete_package.yml |   1 +
 ...kage_events_i_package_npm_pull_package.yml |   1 +
 ...kage_events_i_package_npm_push_package.yml |   1 +
 ..._events_i_package_nuget_delete_package.yml |   1 +
 ...ge_events_i_package_nuget_pull_package.yml |   1 +
 ...ge_events_i_package_nuget_push_package.yml |   1 +
 ..._package_events_i_package_pull_package.yml |   1 +
 ...i_package_pull_package_by_deploy_token.yml |   4 +-
 ...events_i_package_pull_package_by_guest.yml |   4 +-
 ..._events_i_package_pull_package_by_user.yml |   4 +-
 ..._package_events_i_package_push_package.yml |   1 +
 ...i_package_push_package_by_deploy_token.yml |   4 +-
 ...events_i_package_push_package_by_guest.yml |   4 +-
 ..._events_i_package_push_package_by_user.yml |   4 +-
 ...e_events_i_package_pypi_delete_package.yml |   1 +
 ...age_events_i_package_pypi_pull_package.yml |   4 +-
 ...age_events_i_package_pypi_push_package.yml |   1 +
 ...ge_events_i_package_tag_delete_package.yml |   1 +
 ...kage_events_i_package_tag_pull_package.yml |   1 +
 ...kage_events_i_package_tag_push_package.yml |   1 +
 .../20210216183023_wiki_pages_view.yml        |   1 +
 .../20210216183400_omniauth_providers.yml     |   1 +
 .../counts_all/20210216183402_two-factor.yml  |   1 +
 ...210216183404_two-factor-via-u2f-device.yml |   1 +
 ...6183406_two-factor-via-webauthn-device.yml |   1 +
 .../counts_all/20210216183408_standard.yml    |   1 +
 .../20210216183410_google_oauth2.yml          |   1 +
 .../20210204124829_active_user_count.yml      |   1 +
 .../20210201124935_database_adapter.yml       |   5 +-
 ...204124856_instance_auto_devops_enabled.yml |   1 +
 ...10204124858_container_registry_enabled.yml |   1 +
 ...0210204124900_dependency_proxy_enabled.yml |   1 +
 ...04124902_gitlab_shared_runners_enabled.yml |   1 +
 .../20210204124904_gravatar_enabled.yml       |   1 +
 .../settings/20210204124906_ldap_enabled.yml  |   1 +
 .../20210204124908_mattermost_enabled.yml     |   1 +
 .../20210204124910_omniauth_enabled.yml       |   1 +
 .../20210204124912_prometheus_enabled.yml     |   1 +
 ...10204124914_prometheus_metrics_enabled.yml |   1 +
 .../20210204124916_reply_by_email_enabled.yml |   1 +
 .../20210204124918_signup_enabled.yml         |   1 +
 ...920_web_ide_clientside_preview_enabled.yml |   1 +
 .../20210204124922_grafana_link_enabled.yml   |   1 +
 .../settings/20210204124934_pages_enabled.yml |   1 +
 .../settings/20210216174829_smtp_server.yml   |   1 +
 ...0216175459_ingress_modsecurity_enabled.yml |   1 +
 .../settings/20210216175604_edition.yml       |   1 +
 ...6175606_ldap_encrypted_secrets_enabled.yml |   1 +
 .../settings/20210216175609_version.yml       |   1 +
 .../20210216180314_gitpod_enabled.yml         |   1 +
 .../settings/20210216180836_enabled.yml       |   1 +
 .../settings/20210216180838_enabled.yml       |   1 +
 .../settings/20210216180840_direct_upload.yml |   1 +
 .../20210216180841_background_upload.yml      |   1 +
 .../settings/20210216180843_provider.yml      |   1 +
 .../settings/20210216180845_enabled.yml       |   1 +
 .../settings/20210216180847_enabled.yml       |   1 +
 .../settings/20210216180849_direct_upload.yml |   1 +
 .../20210216180851_background_upload.yml      |   1 +
 .../settings/20210216180852_provider.yml      |   1 +
 .../settings/20210216180854_enabled.yml       |   1 +
 .../settings/20210216180856_enabled.yml       |   1 +
 .../settings/20210216180858_direct_upload.yml |   1 +
 .../20210216180900_background_upload.yml      |   1 +
 .../settings/20210216180902_provider.yml      |   1 +
 .../settings/20210216180903_enabled.yml       |   1 +
 .../settings/20210216180905_enabled.yml       |   1 +
 .../settings/20210216180907_direct_upload.yml |   1 +
 .../20210216180909_background_upload.yml      |   1 +
 .../settings/20210216180911_provider.yml      |   1 +
 .../settings/20210216180913_enabled.yml       |   1 +
 .../settings/20210216180915_enabled.yml       |   1 +
 .../settings/20210216180916_direct_upload.yml |   1 +
 .../20210216180918_background_upload.yml      |   1 +
 .../settings/20210216180920_provider.yml      |   1 +
 .../settings/20210216183241_filesystems.yml   |   1 +
 .../settings/20210216183248_pg_system_id.yml  |   3 +-
 ...74914_g_analytics_contribution_monthly.yml |   5 +-
 ...216174918_g_analytics_insights_monthly.yml |   5 +-
 ...10216174921_g_analytics_issues_monthly.yml |   5 +-
 ...74926_g_analytics_productivity_monthly.yml |   5 +-
 ...174929_g_analytics_valuestream_monthly.yml |   5 +-
 ...74937_p_analytics_code_reviews_monthly.yml |   5 +-
 ...216174945_p_analytics_insights_monthly.yml |   5 +-
 ...10216174949_p_analytics_issues_monthly.yml |   5 +-
 ...0210216174953_p_analytics_repo_monthly.yml |   5 +-
 ...5008_p_analytics_merge_request_monthly.yml |   5 +-
 ...175103_merge_requests_with_added_rules.yml |   1 +
 ...erge_requests_with_optional_codeowners.yml |   1 +
 ...erge_requests_with_required_codeowners.yml |   1 +
 ...16175222_user_dependency_scanning_jobs.yml |   1 +
 ...216175224_user_license_management_jobs.yml |   1 +
 ...216175226_dependency_scanning_pipeline.yml |   1 +
 ...36_projects_slack_notifications_active.yml |   1 +
 ...0216175437_projects_slack_slash_active.yml |   1 +
 ...216175505_user_container_scanning_jobs.yml |   1 +
 ...0216175507_container_scanning_pipeline.yml |   1 +
 ...rojects_reporting_ci_cd_back_to_github.yml |   1 +
 .../20210216175616_user_dast_jobs.yml         |   1 +
 .../20210216175618_dast_pipeline.yml          |   1 +
 .../20210216180355_user_api_fuzzing_jobs.yml  |   1 +
 ...210216180357_user_api_fuzzing_dnd_jobs.yml |   1 +
 ...210216180359_coverage_fuzzing_pipeline.yml |   1 +
 .../20210216180401_api_fuzzing_pipeline.yml   |   1 +
 ...210216180427_i_search_advanced_monthly.yml |   1 +
 ..._management_incident_published_monthly.yml |   3 +-
 .../counts_28d/20210216180820_ldap_keys.yml   |   1 +
 .../counts_28d/20210216180822_ldap_users.yml  |   1 +
 ...eam_management_customized_group_stages.yml |   7 +-
 ...825_projects_with_compliance_framework.yml |   1 +
 .../20210216180827_ldap_servers.yml           |   1 +
 .../20210216181156_assignee_lists.yml         |   1 +
 .../20210216181201_milestone_lists.yml        |   1 +
 ...gement_issue_iteration_changed_monthly.yml |   1 +
 ...anagement_issue_weight_changed_monthly.yml |   1 +
 ...management_issue_added_to_epic_monthly.yml |   1 +
 ...gement_issue_removed_from_epic_monthly.yml |   1 +
 ..._management_issue_changed_epic_monthly.yml |   1 +
 ...nt_issue_health_status_changed_monthly.yml |   1 +
 ...i_quickactions_assign_multiple_monthly.yml |   1 +
 ...1534_i_quickactions_child_epic_monthly.yml |   1 +
 ...38_i_quickactions_clear_weight_monthly.yml |   1 +
 ...0216181618_i_quickactions_epic_monthly.yml |   1 +
 ...81626_i_quickactions_iteration_monthly.yml |   1 +
 ...648_i_quickactions_parent_epic_monthly.yml |   1 +
 ...6181652_i_quickactions_promote_monthly.yml |   1 +
 ...6181655_i_quickactions_publish_monthly.yml |   1 +
 ...quickactions_remove_child_epic_monthly.yml |   1 +
 ...725_i_quickactions_remove_epic_monthly.yml |   1 +
 ..._quickactions_remove_iteration_monthly.yml |   1 +
 ...uickactions_remove_parent_epic_monthly.yml |   1 +
 ...16181857_i_quickactions_weight_monthly.yml |   1 +
 ...ojects_mirrored_with_pipelines_enabled.yml |   3 +-
 ...projects_enforcing_code_owner_approval.yml |   1 +
 ...ojects_with_sectional_code_owner_rules.yml |   1 +
 ...requests_with_overridden_project_rules.yml |   1 +
 ...049_projects_with_repositories_enabled.yml |   1 +
 .../20210216182053_users_using_path_locks.yml |   1 +
 .../20210216182054_users_using_lfs_locks.yml  |   1 +
 .../20210216182056_approval_project_rules.yml |   1 +
 ...roval_project_rules_with_target_branch.yml |   1 +
 ...ng_metrics_report_widget_total_monthly.yml |   1 +
 ...roup_code_coverage_visit_total_monthly.yml |   1 +
 ...full_code_quality_report_total_monthly.yml |   1 +
 ...g_web_performance_widget_total_monthly.yml |   1 +
 ...e_coverage_project_click_total_monthly.yml |   1 +
 ..._load_performance_widget_total_monthly.yml |   1 +
 ...rics_report_artifact_uploaders_monthly.yml |   1 +
 ...nces_group_overview_security_dashboard.yml |   1 +
 ...nce_features_track_unique_visits_union.yml |   1 +
 ...testing_paid_monthly_active_user_total.yml |   1 +
 ...10216183613_total_number_of_path_locks.yml |   1 +
 ...216183614_total_number_of_locked_files.yml |   1 +
 ...ules_with_more_approvers_than_required.yml |   1 +
 ...ules_with_less_approvers_than_required.yml |   1 +
 ...ct_rules_with_exact_required_approvers.yml |   1 +
 ...10216183817_user_coverage_fuzzing_jobs.yml |   1 +
 ...210216183828_dependency_scanning_scans.yml |   1 +
 .../counts_28d/20210216183832_dast_scans.yml  |   1 +
 .../20210216183836_coverage_fuzzing_scans.yml |   1 +
 .../20210216183838_api_fuzzing_scans.yml      |   1 +
 ...e_unique_visits_for_any_target_monthly.yml |   1 +
 ...6183926_g_compliance_dashboard_monthly.yml |   1 +
 ...3930_g_compliance_audit_events_monthly.yml |   1 +
 ...3934_i_compliance_audit_events_monthly.yml |   1 +
 ...ompliance_credential_inventory_monthly.yml |   1 +
 ..._a_compliance_audit_events_api_monthly.yml |   1 +
 ...compliance_total_unique_counts_monthly.yml |   1 +
 ...management_vault_build_created_monthly.yml |   1 +
 ...ystem_jira_service_list_issues_monthly.yml |   3 +-
 ...stem_jira_service_create_issue_monthly.yml |   3 +-
 ...174912_g_analytics_contribution_weekly.yml |   5 +-
 ...0216174916_g_analytics_insights_weekly.yml |   5 +-
 ...210216174919_g_analytics_issues_weekly.yml |   5 +-
 ...174923_g_analytics_productivity_weekly.yml |   8 +-
 ...6174927_g_analytics_valuestream_weekly.yml |   8 +-
 ...216174931_p_analytics_pipelines_weekly.yml |   5 +-
 ...174935_p_analytics_code_reviews_weekly.yml |   5 +-
 ...6174939_p_analytics_valuestream_weekly.yml |   5 +-
 ...0216174943_p_analytics_insights_weekly.yml |   5 +-
 ...210216174947_p_analytics_issues_weekly.yml |   5 +-
 ...20210216174951_p_analytics_repo_weekly.yml |   5 +-
 ...10216174955_i_analytics_cohorts_weekly.yml |   7 +-
 ...74958_i_analytics_dev_ops_score_weekly.yml |   5 +-
 ...75002_g_analytics_merge_request_weekly.yml |   7 +-
 ...75006_p_analytics_merge_request_weekly.yml |   8 +-
 ...0210216180425_i_search_advanced_weekly.yml |   1 +
 ...t_management_incident_published_weekly.yml |   3 +-
 ...agement_issue_iteration_changed_weekly.yml |   1 +
 ...management_issue_weight_changed_weekly.yml |   1 +
 ..._management_issue_added_to_epic_weekly.yml |   1 +
 ...t_management_issue_changed_epic_weekly.yml |   1 +
 ...ent_issue_health_status_changed_weekly.yml |   1 +
 ..._i_quickactions_assign_multiple_weekly.yml |   1 +
 ...81532_i_quickactions_child_epic_weekly.yml |   1 +
 ...536_i_quickactions_clear_weight_weekly.yml |   1 +
 ...10216181617_i_quickactions_epic_weekly.yml |   1 +
 ...181624_i_quickactions_iteration_weekly.yml |   1 +
 ...1646_i_quickactions_parent_epic_weekly.yml |   1 +
 ...16181650_i_quickactions_promote_weekly.yml |   1 +
 ...16181654_i_quickactions_publish_weekly.yml |   1 +
 ..._quickactions_remove_child_epic_weekly.yml |   1 +
 ...1723_i_quickactions_remove_epic_weekly.yml |   1 +
 ...i_quickactions_remove_iteration_weekly.yml |   1 +
 ...quickactions_remove_parent_epic_weekly.yml |   1 +
 ...216181856_i_quickactions_weight_weekly.yml |   1 +
 ...ing_metrics_report_widget_total_weekly.yml |   1 +
 ...group_code_coverage_visit_total_weekly.yml |   1 +
 ..._full_code_quality_report_total_weekly.yml |   1 +
 ...ng_web_performance_widget_total_weekly.yml |   1 +
 ...g_load_performance_widget_total_weekly.yml |   1 +
 ...trics_report_artifact_uploaders_weekly.yml |   4 +-
 ...nce_features_track_unique_visits_union.yml |  12 +-
 ...testing_paid_monthly_active_user_total.yml |   4 +-
 ...ch_unique_visits_for_any_target_weekly.yml |   6 +-
 ...16183924_g_compliance_dashboard_weekly.yml |  11 +-
 ...83928_g_compliance_audit_events_weekly.yml |  12 +-
 ...83932_i_compliance_audit_events_weekly.yml |  11 +-
 ...compliance_credential_inventory_weekly.yml |  11 +-
 ...0_a_compliance_audit_events_api_weekly.yml |  11 +-
 ..._compliance_total_unique_counts_weekly.yml |  11 +-
 .../20210216184033_i_search_paid_weekly.yml   |   4 +-
 ...de_coverage_project_click_total_weekly.yml |   4 +-
 ...138_testing_total_unique_counts_weekly.yml |   1 +
 ...agement_issue_removed_from_epic_weekly.yml |   1 +
 ..._management_vault_build_created_weekly.yml |   1 +
 ...erraform_state_api_unique_users_weekly.yml |   1 +
 ..._templates_implicit_auto_devops_weekly.yml |   3 +-
 ...ates_implicit_auto_devops_build_weekly.yml |   3 +-
 ...tes_implicit_auto_devops_deploy_weekly.yml |   3 +-
 ...emplates_implicit_security_sast_weekly.yml |   3 +-
 ...licit_security_secret_detection_weekly.yml |   3 +-
 ...4520_p_ci_templates_auto_devops_weekly.yml |   3 +-
 ..._ci_templates_auto_devops_build_weekly.yml |   7 +-
 ...ci_templates_auto_devops_deploy_weekly.yml |   7 +-
 ...lates_auto_devops_deploy_latest_weekly.yml |   3 +-
 ...44_p_ci_templates_security_sast_weekly.yml |   3 +-
 ...lates_security_secret_detection_weekly.yml |   3 +-
 ...templates_terraform_base_latest_weekly.yml |   3 +-
 ...uickactions_total_unique_counts_weekly.yml |   1 +
 ...system_jira_service_list_issues_weekly.yml |   5 +-
 ...ystem_jira_service_create_issue_weekly.yml |   3 +-
 ...20210204124854_license_management_jobs.yml |   1 +
 .../20210216174822_ldap_group_links.yml       |   1 +
 .../counts_all/20210216174824_ldap_keys.yml   |   1 +
 .../counts_all/20210216174826_ldap_users.yml  |   1 +
 ...216174834_productivity_analytics_views.yml |   3 +-
 ...0210216174836_g_analytics_contribution.yml |   5 +-
 .../20210216174838_g_analytics_insights.yml   |   5 +-
 .../20210216174840_g_analytics_issues.yml     |   5 +-
 ...0210216174842_g_analytics_productivity.yml |   5 +-
 ...20210216174844_g_analytics_valuestream.yml |   5 +-
 ...0210216174848_p_analytics_code_reviews.yml |   5 +-
 .../20210216174852_p_analytics_insights.yml   |   5 +-
 .../20210216174854_p_analytics_issues.yml     |   5 +-
 ...210216174904_p_analytics_merge_request.yml |   5 +-
 .../20210216175028_requirements_created.yml   |   1 +
 ...175030_requirement_test_reports_manual.yml |   1 +
 ...0216175032_requirement_test_reports_ci.yml |   1 +
 ...16175034_requirements_with_test_report.yml |   1 +
 ...175047_merge_requests_with_added_rules.yml |   1 +
 ...erge_requests_with_optional_codeowners.yml |   1 +
 ...erge_requests_with_required_codeowners.yml |   1 +
 ...216175211_dependency_list_usages_total.yml |   1 +
 ...0210216175213_dependency_scanning_jobs.yml |   1 +
 ...16175216_user_dependency_scanning_jobs.yml |   1 +
 ...216175218_user_license_management_jobs.yml |   1 +
 ...210216175220_dependency_scanning_scans.yml |   1 +
 .../20210216175316_kubernetes_agents.yml      |   1 +
 ...216175318_kubernetes_agents_with_token.yml |   1 +
 ...216175328_kubernetes_agent_gitops_sync.yml |   1 +
 ...00_projects_slack_notifications_active.yml |   5 +-
 ...0216175402_projects_slack_slash_active.yml |   5 +-
 ...ess_modsecurity_statistics_unavailable.yml |   1 +
 ...20210216175458_container_scanning_jobs.yml |   1 +
 ...216175501_user_container_scanning_jobs.yml |   1 +
 ...0210216175503_container_scanning_scans.yml |   3 +-
 ...rojects_reporting_ci_cd_back_to_github.yml |   3 +-
 .../counts_all/20210216175612_dast_jobs.yml   |   1 +
 .../20210216175614_user_dast_jobs.yml         |   1 +
 .../20210216175848_projects_github_active.yml |   1 +
 .../20210216175850_groups_github_active.yml   |   1 +
 ...20210216175851_templates_github_active.yml |   1 +
 ...20210216175853_instances_github_active.yml |   1 +
 ...5855_projects_inheriting_github_active.yml |   1 +
 ...175857_groups_inheriting_github_active.yml |   1 +
 ...6180236_projects_jira_issuelist_active.yml |   1 +
 .../20210216180344_api_fuzzing_jobs.yml       |   1 +
 .../20210216180346_api_fuzzing_dnd_jobs.yml   |   5 +-
 .../20210216180348_user_api_fuzzing_jobs.yml  |   1 +
 ...210216180350_user_api_fuzzing_dnd_jobs.yml |   1 +
 .../20210216180352_coverage_fuzzing_scans.yml |   5 +-
 .../20210216180353_api_fuzzing_scans.yml      |   1 +
 .../20210216180405_geo_event_log_max_id.yml   |   1 +
 .../20210216180418_i_search_advanced.yml      |   1 +
 .../20210216180420_i_search_paid.yml          |   1 +
 ...6180502_status_page_incident_publishes.yml |   1 +
 ...80504_status_page_incident_unpublishes.yml |   1 +
 .../20210216180506_status_page_projects.yml   |   1 +
 .../20210216180507_status_page_issues.yml     |   1 +
 ...16180522_projects_incident_sla_enabled.yml |   1 +
 .../counts_all/20210216180800_ldap_keys.yml   |   1 +
 .../counts_all/20210216180801_ldap_users.yml  |   1 +
 ...eam_management_customized_group_stages.yml |   1 +
 ...805_projects_with_compliance_framework.yml |   1 +
 .../20210216180807_ldap_servers.yml           |   1 +
 .../20210216181100_assignee_lists.yml         |   1 +
 .../20210216181106_milestone_lists.yml        |   1 +
 .../20210216181132_assignee_lists.yml         |   1 +
 .../20210216181137_milestone_lists.yml        |   1 +
 .../20210216181205_confidential_epics.yml     |   1 +
 .../counts_all/20210216181206_epics.yml       |   1 +
 .../counts_all/20210216181208_epic_issues.yml |   1 +
 ...210216181210_issues_with_health_status.yml |   1 +
 ...81212_epics_deepest_relationship_level.yml |   1 +
 ...ojects_mirrored_with_pipelines_enabled.yml |   3 +-
 ...ojects_mirrored_with_pipelines_enabled.yml |   3 +-
 ...959_projects_with_repositories_enabled.yml |   1 +
 .../20210216182001_protected_branches.yml     |   1 +
 .../20210216182008_template_repositories.yml  |   1 +
 ...projects_enforcing_code_owner_approval.yml |   1 +
 ...ojects_with_sectional_code_owner_rules.yml |   1 +
 ...023_projects_with_repositories_enabled.yml |   1 +
 .../20210216182025_protected_branches.yml     |   1 +
 ...10216182027_total_number_of_path_locks.yml |   1 +
 ...216182028_total_number_of_locked_files.yml |   1 +
 .../20210216182030_approval_project_rules.yml |   1 +
 ...roval_project_rules_with_target_branch.yml |   1 +
 .../counts_all/20210216182120_sast_scans.yml  |   1 +
 .../counts_all/20210216182122_dast_scans.yml  |   1 +
 .../20210216182123_secret_detection_scans.yml |   1 +
 ...ser_preferences_group_overview_details.yml |   1 +
 ...nces_group_overview_security_dashboard.yml |   1 +
 ...nces_group_overview_security_dashboard.yml |   1 +
 ...rojects_reporting_ci_cd_back_to_github.yml |   1 +
 .../20210216183146_coverage_fuzzing_jobs.yml  |   1 +
 ...0210216183149_dast_on_demand_pipelines.yml |   1 +
 ...requests_with_overridden_project_rules.yml |   1 +
 .../20210216183344_users_using_path_locks.yml |   1 +
 .../20210216183346_users_using_lfs_locks.yml  |   1 +
 ...ules_with_more_approvers_than_required.yml |   1 +
 ...ules_with_less_approvers_than_required.yml |   1 +
 ...ct_rules_with_exact_required_approvers.yml |   1 +
 ...10216183514_user_coverage_fuzzing_jobs.yml |   1 +
 ...16183753_projects_incident_sla_enabled.yml |   3 +-
 .../20210216183904_g_compliance_dashboard.yml |  11 +-
 ...210216183906_g_compliance_audit_events.yml |  11 +-
 ...210216183908_i_compliance_audit_events.yml |  11 +-
 ...3910_i_compliance_credential_inventory.yml |  11 +-
 ...16183912_a_compliance_audit_events_api.yml |  11 +-
 ...ompliance_unique_visits_for_any_target.yml |  11 +-
 .../20210216184035_i_search_paid_monthly.yml  |   1 +
 .../license/20210204124831_license_md5.yml    |   3 +-
 .../license/20210204124833_license_id.yml     |   1 +
 .../20210204124835_historical_max_users.yml   |   1 +
 .../metrics/license/20210204124837_name.yml   |   1 +
 .../metrics/license/20210204124839_email.yml  |   1 +
 .../license/20210204124841_company.yml        |   1 +
 .../20210204124843_license_user_count.yml     |   1 +
 .../20210204124845_license_starts_at.yml      |   1 +
 .../20210204124847_license_expires_at.yml     |   1 +
 .../license/20210204124849_license_plan.yml   |   1 +
 .../license/20210204124851_license_trial.yml  |   1 +
 ...20210204124852_license_subscription_id.yml |   3 +-
 .../20210204124926_license_trial_ends_on.yml  |   1 +
 .../20210216175210_licenses_list_views.yml    |   1 +
 .../20210204124924_elasticsearch_enabled.yml  |   1 +
 .../settings/20210216180406_geo_enabled.yml   |   1 +
 ...20210216180809_ldap_group_sync_enabled.yml |   1 +
 ...20210216180811_ldap_admin_sync_enabled.yml |   1 +
 .../20210216180813_group_saml_enabled.yml     |   8 +-
 ...20210216180829_ldap_group_sync_enabled.yml |   1 +
 ...20210216180831_ldap_admin_sync_enabled.yml |   1 +
 .../20210216180833_group_saml_enabled.yml     |   1 +
 1389 files changed, 3061 insertions(+), 1569 deletions(-)

diff --git a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
index b031e885f93ea..27660b98bf93c 100644
--- a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
@@ -5,11 +5,11 @@ description: Unique visitors to any analytics feature by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
@@ -19,3 +19,4 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
index 85c50572707a2..af6504f4ae16b 100644
--- a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /groups/:group/-/analytics/ci_cd by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_pipelines
+  - p_analytics_pipelines
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
index 70d4cb50aa43c..4512b97d6e9e1 100644
--- a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
+++ b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/-/value_stream_analytics by mon
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_valuestream
+  - p_analytics_valuestream
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
index ed867d30ff3f7..a46d13e0085e5 100644
--- a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
+++ b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.analytics.i_analytics_cohorts_monthly
-description: 
+description:
 product_section: fulfillment
 product_stage: fulfillment
 product_group: group::utilization
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_analytics_cohorts
+  - i_analytics_cohorts
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
index af99fdbcca85f..9e94beda9b673 100644
--- a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
+++ b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /admin/dev_ops_report by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_analytics_dev_ops_score
+  - i_analytics_dev_ops_score
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
index 7ef394eddae1d..f6671c22f1351 100644
--- a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_merge_request
+  - g_analytics_merge_request
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
index b46687608b459..4104873568664 100644
--- a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
+++ b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /admin/usage_trends by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_analytics_instance_statistics
+  - i_analytics_instance_statistics
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
index fa71e5607c1e8..2e3317dc4ba38 100644
--- a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
@@ -13,26 +13,27 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - users_viewing_analytics_group_devops_adoption
-    - i_analytics_dev_ops_adoption
-    - i_analytics_dev_ops_score
-    - p_analytics_merge_request
-    - i_analytics_instance_statistics
-    - g_analytics_contribution
-    - g_analytics_insights
-    - g_analytics_issues
-    - g_analytics_productivity
-    - g_analytics_valuestream
-    - p_analytics_pipelines
-    - p_analytics_code_reviews
-    - p_analytics_valuestream
-    - p_analytics_insights
-    - p_analytics_issues
-    - p_analytics_repo
-    - i_analytics_cohorts
+  - users_viewing_analytics_group_devops_adoption
+  - i_analytics_dev_ops_adoption
+  - i_analytics_dev_ops_score
+  - p_analytics_merge_request
+  - i_analytics_instance_statistics
+  - g_analytics_contribution
+  - g_analytics_insights
+  - g_analytics_issues
+  - g_analytics_productivity
+  - g_analytics_valuestream
+  - p_analytics_pipelines
+  - p_analytics_code_reviews
+  - p_analytics_valuestream
+  - p_analytics_insights
+  - p_analytics_issues
+  - p_analytics_repo
+  - i_analytics_cohorts
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175055_merge_requests.yml b/config/metrics/counts_28d/20210216175055_merge_requests.yml
index 97e1983b5d6bf..999370ab812fc 100644
--- a/config/metrics/counts_28d/20210216175055_merge_requests.yml
+++ b/config/metrics/counts_28d/20210216175055_merge_requests.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
index 921ab4885fad9..4f0568162b66c 100644
--- a/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.create.projects_with_disable_overriding_approvers_per_merge_request
-description: Count of the number of projects with setting to disable overriding approvers per merge request
+description: Count of the number of projects with setting to disable overriding approvers
+  per merge request
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
index b86af740a13e3..462121c8f682a 100644
--- a/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.create.projects_without_disable_overriding_approvers_per_merge_request
-description: Count of the number of projects without setting to disable overriding approvers per merge request
+description: Count of the number of projects without setting to disable overriding
+  approvers per merge request
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
index 6cdb30a18bfbd..4eb2daf029164 100644
--- a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
+++ b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
@@ -20,3 +20,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175109_suggestions.yml b/config/metrics/counts_28d/20210216175109_suggestions.yml
index 6b41d92d91f70..301f0774ea134 100644
--- a/config/metrics/counts_28d/20210216175109_suggestions.yml
+++ b/config/metrics/counts_28d/20210216175109_suggestions.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.create.suggestions
-description: Count of unique users per month who create suggestions in merge request comments
+description: Count of unique users per month who create suggestions in merge request
+  comments
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
index 2db087832d0ee..adb4c24b1e5bf 100644
--- a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml b/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
index be85a73c7fa04..0eb0c0cd202e0 100644
--- a/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
+++ b/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml b/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
index 18b89a5b25a99..0d074a735e4dd 100644
--- a/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_mr_diffs
+  - i_code_review_mr_diffs
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml b/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
index b518c0409262b..7d384cd15f347 100644
--- a/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_single_file_diffs
+  - i_code_review_user_single_file_diffs
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml b/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
index c256637f36707..7ea07ce02ec08 100644
--- a/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_mr_single_file_diffs
+  - i_code_review_mr_single_file_diffs
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
index 013f185730af1..dbfdd9cd8dfb8 100644
--- a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_mr
+  - i_code_review_user_create_mr
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml b/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
index 744afd9809bfb..726ceaa2f1b78 100644
--- a/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_close_mr
+  - i_code_review_user_close_mr
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml b/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
index 45f5b8e6dac3b..56d20c546e94b 100644
--- a/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_reopen_mr
+  - i_code_review_user_reopen_mr
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml b/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
index 4a7035c3ee158..7a38d14c85a4a 100644
--- a/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_merge_mr
+  - i_code_review_user_merge_mr
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
index 8fd9dd9778049..a2803df3bdcd9 100644
--- a/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_mr_comment
+  - i_code_review_user_create_mr_comment
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
index 693e70751044b..450e631927ecf 100644
--- a/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_edit_mr_comment
+  - i_code_review_user_edit_mr_comment
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
index 80d47f5258321..48d9a9374f6a7 100644
--- a/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_remove_mr_comment
+  - i_code_review_user_remove_mr_comment
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml b/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
index a92186f267885..0399cc259a99e 100644
--- a/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
+++ b/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_add_suggestion
+  - i_code_review_user_add_suggestion
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml b/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
index 468b106236515..53ecc3e24144f 100644
--- a/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
+++ b/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_apply_suggestion
+  - i_code_review_user_apply_suggestion
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
index 4637648ce92ee..87255c7f02766 100644
--- a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,8 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters_applications_cert_managers.status IN (3, 5))'>_clusters_<with>_<adjective describing: '(clusters_applications_cert_managers.status IN (3, 5))'>_clusters_applications_cert_managers"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters_applications_cert_managers.status
+  IN (3, 5))''>_clusters_<with>_<adjective describing: ''(clusters_applications_cert_managers.status
+  IN (3, 5))''>_clusters_applications_cert_managers'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
index 9e092d6f2e35e..bf78e778964f9 100644
--- a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
+++ b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,8 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters_applications_helm.status IN (3, 5))'>_clusters_<with>_<adjective describing: '(clusters_applications_helm.status IN (3, 5))'>_clusters_applications_helm"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters_applications_helm.status
+  IN (3, 5))''>_clusters_<with>_<adjective describing: ''(clusters_applications_helm.status
+  IN (3, 5))''>_clusters_applications_helm'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
index 56ee17554ebf3..caa279e3c814d 100644
--- a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
+++ b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,8 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters_applications_ingress.status IN (3, 5))'>_clusters_<with>_<adjective describing: '(clusters_applications_ingress.status IN (3, 5))'>_clusters_applications_ingress"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters_applications_ingress.status
+  IN (3, 5))''>_clusters_<with>_<adjective describing: ''(clusters_applications_ingress.status
+  IN (3, 5))''>_clusters_applications_ingress'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
index 3bed0406dd57f..0aa251b4426eb 100644
--- a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
+++ b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,8 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters_applications_knative.status IN (3, 5))'>_clusters_<with>_<adjective describing: '(clusters_applications_knative.status IN (3, 5))'>_clusters_applications_knative"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters_applications_knative.status
+  IN (3, 5))''>_clusters_<with>_<adjective describing: ''(clusters_applications_knative.status
+  IN (3, 5))''>_clusters_applications_knative'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
index 6e7f851eb6d15..bf25c13788be3 100644
--- a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
+++ b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
@@ -1,8 +1,9 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_management_project
-name: "count_distinct_user_id_from_management_project_clusters"
-description: Number of Kubernetes clusters with clusters management project being set
+name: count_distinct_user_id_from_management_project_clusters
+description: Number of Kubernetes clusters with clusters management project being
+  set
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -19,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
index 8c2e9b87870ae..7e1604b2bc113 100644
--- a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,6 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = FALSE)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = FALSE)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
index 80e3872ddc355..b3e973348db5d 100644
--- a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,6 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = TRUE)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = TRUE)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
index 0a2f09a4bc00b..e766872ba8b2d 100644
--- a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
+++ b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,9 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.provider_type = 1 AND (cluster_providers_gcp.status IN (3)) AND clusters.enabled = TRUE)'>_clusters_<with>_<adjective describing: '(clusters.provider_type = 1 AND (cluster_providers_gcp.status IN (3)) AND clusters.enabled = TRUE)'>_cluster_providers_gcp"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.provider_type
+  = 1 AND (cluster_providers_gcp.status IN (3)) AND clusters.enabled = TRUE)''>_clusters_<with>_<adjective
+  describing: ''(clusters.provider_type = 1 AND (cluster_providers_gcp.status IN (3))
+  AND clusters.enabled = TRUE)''>_cluster_providers_gcp'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
index 63da2198876c1..2cf73d21b2054 100644
--- a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
+++ b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,9 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.provider_type = 2 AND (cluster_providers_aws.status IN (3)) AND clusters.enabled = TRUE)'>_clusters_<with>_<adjective describing: '(clusters.provider_type = 2 AND (cluster_providers_aws.status IN (3)) AND clusters.enabled = TRUE)'>_cluster_providers_aws"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.provider_type
+  = 2 AND (cluster_providers_aws.status IN (3)) AND clusters.enabled = TRUE)''>_clusters_<with>_<adjective
+  describing: ''(clusters.provider_type = 2 AND (cluster_providers_aws.status IN (3))
+  AND clusters.enabled = TRUE)''>_cluster_providers_aws'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
index 2cb190d348f28..8051bc1da6d45 100644
--- a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
+++ b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,7 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.provider_type = 0 AND clusters.enabled = TRUE)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.provider_type
+  = 0 AND clusters.enabled = TRUE)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
index e67abe0543c04..6f8691ffdae9d 100644
--- a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,7 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = FALSE AND clusters.cluster_type = 1)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = FALSE
+  AND clusters.cluster_type = 1)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
index 44784dbf040a6..d97c7babe34f2 100644
--- a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,7 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = TRUE AND clusters.cluster_type = 1)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = TRUE
+  AND clusters.cluster_type = 1)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
index 61735006560d1..00d71cf8de5f7 100644
--- a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,7 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = FALSE AND clusters.cluster_type = 2)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = FALSE
+  AND clusters.cluster_type = 2)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
index 3973ddf26b6ff..aae8498d97554 100644
--- a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,7 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = TRUE AND clusters.cluster_type = 2)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = TRUE
+  AND clusters.cluster_type = 2)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
index 17b6fef01515e..a3ac9e910acb9 100644
--- a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,7 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = FALSE AND clusters.cluster_type = 3)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = FALSE
+  AND clusters.cluster_type = 3)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
index a59cdae01e503..32a019838d953 100644
--- a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,7 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = TRUE AND clusters.cluster_type = 3)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = TRUE
+  AND clusters.cluster_type = 3)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175542_ci_builds.yml b/config/metrics/counts_28d/20210216175542_ci_builds.yml
index ac42d618ea00d..95cb0135e6232 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
index a3044a7b9aa94..7cb2afc5f4935 100644
--- a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
index 2b125cf1a7c4a..1d0d719d736a5 100644
--- a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
index 8bf228643c8a3..76788ba1b8eaf 100644
--- a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 dd470b7da229f..19f793da7f870 100644
--- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
index a593d08a567ea..e24c10ab6aad2 100644
--- a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
index fdb67b99e55c2..f6d9c2c77b27e 100644
--- a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.verify.ci_pipelines
-description: "Distinct users triggering pipelines in a month"
+description: Distinct users triggering pipelines in a month
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
@@ -22,3 +22,4 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175556_ci_triggers.yml b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
index a8f784ec579d8..1b79e112a3720 100644
--- a/config/metrics/counts_28d/20210216175556_ci_triggers.yml
+++ b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180308_personal_snippets.yml b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
index 1a4183acc6205..993aa62a3841b 100644
--- a/config/metrics/counts_28d/20210216180308_personal_snippets.yml
+++ b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180310_project_snippets.yml b/config/metrics/counts_28d/20210216180310_project_snippets.yml
index 1037c5ed029a4..bcc0e607f5af4 100644
--- a/config/metrics/counts_28d/20210216180310_project_snippets.yml
+++ b/config/metrics/counts_28d/20210216180310_project_snippets.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180312_snippets.yml b/config/metrics/counts_28d/20210216180312_snippets.yml
index 22e242d5cab36..ba80b6c583fcf 100644
--- a/config/metrics/counts_28d/20210216180312_snippets.yml
+++ b/config/metrics/counts_28d/20210216180312_snippets.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180317_snippets.yml b/config/metrics/counts_28d/20210216180317_snippets.yml
index b501c8dd6d013..783613bd50903 100644
--- a/config/metrics/counts_28d/20210216180317_snippets.yml
+++ b/config/metrics/counts_28d/20210216180317_snippets.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 fc52a50969e32..3b482949b35b9 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 809f1bcc52fe9..6ec45a8c101be 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 6c9bb0319cc9e..d28300e73a182 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 a181eacd724ef..5cdc25d64666a 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 f15f9817a58e2..1205500758944 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
@@ -20,3 +20,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
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 770ba30b8a2cf..94a7b14186b91 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
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 44a6758d41eba..6b1c4f7a65773 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
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 5cc87cba4692e..a09a4d808072d 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
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 81ccdfd085403..30f88f07af8dc 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
@@ -25,3 +25,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
index 89afaa17bcea5..d8e256c5a27c8 100644
--- a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
+++ b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
index 41d6d1f0d9625..c2a2fa740282b 100644
--- a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
@@ -1,7 +1,10 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.search.search_total_unique_counts_monthly
-description: Total unique users for i_search_total, i_search_advanced, i_search_paid for recent 28 days. This metric is redundant because advanced will be a subset of paid and paid will be a subset of total. i_search_total is more appropriate if you just want the total
+description: Total unique users for i_search_total, i_search_advanced, i_search_paid
+  for recent 28 days. This metric is redundant because advanced will be a subset of
+  paid and paid will be a subset of total. i_search_total is more appropriate if you
+  just want the total
 product_section: enablement
 product_stage: enablement
 product_group: group::global search
@@ -25,3 +28,4 @@ tier:
 - ultimate
 performance_indicator_type:
 - gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
index 8a76ed1dc22ba..f1aff3238387c 100644
--- a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
index c561aafb14432..32f3effb44da2 100644
--- a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
index f9a8a2d440a1a..643e4e40a6a23 100644
--- a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
+++ b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_with_incidents
-description: 'Count of unique projects with an incident created in the last month'
+description: Count of unique projects with an incident created in the last month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
index 70234ac6602fe..46a076ed2e041 100644
--- a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
@@ -1,8 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_with_alert_incidents
-description: 'Count of unique projects with an incident from an alert created in the
-  last month'
+description: Count of unique projects with an incident from an alert created in the
+  last month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml b/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
index 5bbb15c786c14..412b1b718731d 100644
--- a/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users changing alert's status changes per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_alert_status_changed
+  - incident_management_alert_status_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml b/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
index a23e14b88799a..f10043b70c5de 100644
--- a/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users assigning an alert per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_alert_assigned
+  - incident_management_alert_assigned
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml b/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
index 4cbc1280562f0..6276f172cb814 100644
--- a/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding alerts to the TODO list per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_alert_todo
+  - incident_management_alert_todo
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml b/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
index 97680ad4d1b82..124f29ae5a163 100644
--- a/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users creating incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_created
+  - incident_management_incident_created
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml b/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
index f14f31af62dab..38f5dc4735cd3 100644
--- a/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users reopening incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_reopened
+  - incident_management_incident_reopened
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml b/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
index 0809c3fab68b3..c1383c422fbb2 100644
--- a/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
@@ -5,7 +5,7 @@ description: Count of users closing incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_closed
+  - incident_management_incident_closed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml b/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
index ceed852b509f8..cd051e1ad5cb4 100644
--- a/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
@@ -5,7 +5,7 @@ description: Count of users assigning incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_assigned
+  - incident_management_incident_assigned
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml b/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
index fbe1a334bbb37..c8cc00bb9d613 100644
--- a/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding incidents to the TODO list per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_todo
+  - incident_management_incident_todo
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml b/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
index d812b52d97b61..773e99ed00390 100644
--- a/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding comments per month on incidents
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_comment
+  - incident_management_incident_comment
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml b/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
index 313f75f7ebba9..96f4de1240cdb 100644
--- a/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
+++ b/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
@@ -5,7 +5,7 @@ description: Count of users creating Zoom meetings about incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_zoom_meeting
+  - incident_management_incident_zoom_meeting
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml b/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
index 75c9fa64f8c50..28d30ee0378eb 100644
--- a/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_relate_monthly
-description: Count of unique users adding issues per month that are related to an incident
+description: Count of unique users adding issues per month that are related to an
+  incident
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_relate
+  - incident_management_incident_relate
 distribution:
 - ce
 - ee
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml b/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
index 473b0a2b2adcb..01e21b8a3c56c 100644
--- a/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
+++ b/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
@@ -5,7 +5,7 @@ description: Count of users removing issues that are related to an incident per
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_unrelate
+  - incident_management_incident_unrelate
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml b/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
index 17ab21c98184a..60d606fb61151 100644
--- a/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
@@ -5,7 +5,7 @@ description: Count of users changing incidents to confidential per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_change_confidential
+  - incident_management_incident_change_confidential
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
index 5a09b270eb2fc..f9430a0c9eba3 100644
--- a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users performing events related with incidents per
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,20 +13,20 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_created
-    - incident_management_incident_reopened
-    - incident_management_incident_closed
-    - incident_management_incident_assigned
-    - incident_management_incident_todo
-    - incident_management_incident_comment
-    - incident_management_incident_zoom_meeting
-    - incident_management_incident_published
-    - incident_management_incident_relate
-    - incident_management_incident_unrelate
-    - incident_management_incident_change_confidential
-    - incident_management_alert_status_changed
-    - incident_management_alert_assigned
-    - incident_management_alert_todo
+  - incident_management_incident_created
+  - incident_management_incident_reopened
+  - incident_management_incident_closed
+  - incident_management_incident_assigned
+  - incident_management_incident_todo
+  - incident_management_incident_comment
+  - incident_management_incident_zoom_meeting
+  - incident_management_incident_published
+  - incident_management_incident_relate
+  - incident_management_incident_unrelate
+  - incident_management_incident_change_confidential
+  - incident_management_alert_status_changed
+  - incident_management_alert_assigned
+  - incident_management_alert_todo
 distribution:
 - ce
 - ee
@@ -38,3 +38,4 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml b/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
index 14ba7fa3421c9..56b05502bbfd9 100644
--- a/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
+++ b/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
@@ -14,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_alert_create_incident
+  - incident_management_alert_create_incident
 distribution:
 - ce
 - ee
@@ -23,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml b/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
index 38048e0f443b3..4bb680d579c9f 100644
--- a/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
+++ b/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 beb8969618fac..213fa6da4b93e 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
@@ -19,3 +19,4 @@ tier:
 - ultimate
 performance_indicator_type:
 - paid_gmau
+milestone: "<13.9"
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 1353686c5a61d..d52e9b4c348da 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180814_events.yml b/config/metrics/counts_28d/20210216180814_events.yml
index 384505384f8ff..f901c8ce50883 100644
--- a/config/metrics/counts_28d/20210216180814_events.yml
+++ b/config/metrics/counts_28d/20210216180814_events.yml
@@ -5,7 +5,7 @@ description: Number of distinct users who have generated a manage event by month
 product_section: dev
 product_stage: manage
 product_group: group::manage
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -19,3 +19,4 @@ tier:
 - ultimate
 performance_indicator_type:
 - umau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180816_groups.yml b/config/metrics/counts_28d/20210216180816_groups.yml
index 247fa015c2265..a6876a8536ae9 100644
--- a/config/metrics/counts_28d/20210216180816_groups.yml
+++ b/config/metrics/counts_28d/20210216180816_groups.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180818_users_created.yml b/config/metrics/counts_28d/20210216180818_users_created.yml
index 319b8a08e79c6..28af6c26da728 100644
--- a/config/metrics/counts_28d/20210216180818_users_created.yml
+++ b/config/metrics/counts_28d/20210216180818_users_created.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 7b928a08faee0..301c0db93b6e2 100644
--- a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.projects_with_prometheus_alerts
 description: Projects with Prometheus alerting enabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180956_clusters.yml b/config/metrics/counts_28d/20210216180956_clusters.yml
index d5a54796a1f69..e740a7ef2e722 100644
--- a/config/metrics/counts_28d/20210216180956_clusters.yml
+++ b/config/metrics/counts_28d/20210216180956_clusters.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.clusters
 description: Count users creating clusters in last 28 days.
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
index 615bb247f867b..2ad307ce7a5d7 100644
--- a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.clusters_applications_prometheus
 description: Users creating clusters with Prometheus enabled in last 28 days.
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
index 2d29c9fd088fd..14ab239037c23 100644
--- a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.operations_dashboard_default_dashboard
 description: Active users with enabled operations dashboard
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
index ac0e6015cb99d..e0e5e90dc511c 100644
--- a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_with_tracing_enabled
 description: Projects with tracing enabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: tracing
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml b/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
index f5c1ecec384e3..f7fe9f25b0d61 100644
--- a/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_with_error_tracking_enabled
 description: Count of users creating projects with error tracking enabled.
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
index 7ffe2e82ab2ba..39fd144b66d03 100644
--- a/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.operations_dashboard_users_with_projects_added
 description: Active users with projects on operations dashboard
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181050_packages.yml b/config/metrics/counts_28d/20210216181050_packages.yml
index c007ab501829f..27b996c773522 100644
--- a/config/metrics/counts_28d/20210216181050_packages.yml
+++ b/config/metrics/counts_28d/20210216181050_packages.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
index e1f1bcd05e7b2..bbee004d1304f 100644
--- a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
+++ b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181139_issues.yml b/config/metrics/counts_28d/20210216181139_issues.yml
index dd36265fe9dc1..e8ec3406622c3 100644
--- a/config/metrics/counts_28d/20210216181139_issues.yml
+++ b/config/metrics/counts_28d/20210216181139_issues.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181141_notes.yml b/config/metrics/counts_28d/20210216181141_notes.yml
index 0e2d39e42e702..bc38186bd10ad 100644
--- a/config/metrics/counts_28d/20210216181141_notes.yml
+++ b/config/metrics/counts_28d/20210216181141_notes.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181143_projects.yml b/config/metrics/counts_28d/20210216181143_projects.yml
index 16e2ddf8050b5..3dafe40b3e423 100644
--- a/config/metrics/counts_28d/20210216181143_projects.yml
+++ b/config/metrics/counts_28d/20210216181143_projects.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181145_todos.yml b/config/metrics/counts_28d/20210216181145_todos.yml
index e35963f2a57fc..c83f054859d3c 100644
--- a/config/metrics/counts_28d/20210216181145_todos.yml
+++ b/config/metrics/counts_28d/20210216181145_todos.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
index 92f5a618bff90..4344144d592fb 100644
--- a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
@@ -15,6 +15,7 @@ distribution:
 - ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
index 0cd2ea2632fe0..75e4bc9335484 100644
--- a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
+++ b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
@@ -5,7 +5,7 @@ description: Count of service desk issues
 product_section: dev
 product_stage: plan
 product_group: group::plan
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
index a51dfa3e49fd5..8a386ce02e988 100644
--- a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
+++ b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
@@ -1,7 +1,7 @@
 ---
 data_category: operational
 key_path: usage_activity_by_stage_monthly.plan.projects_jira_active
-description:  Distinct count of creator_id from projects with an active Jira integration.
+description: Distinct count of creator_id from projects with an active Jira integration.
 product_section: dev
 product_stage: ecosystem
 product_group: group::integrations
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
index e78d178c081e1..3aef852d44ce3 100644
--- a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
@@ -1,7 +1,8 @@
 ---
 data_category: operational
 key_path: usage_activity_by_stage_monthly.plan.projects_jira_dvcs_cloud_active
-description: Distinct count of creator_id from projects with an active Jira Cloud DVCS integration.
+description: Distinct count of creator_id from projects with an active Jira Cloud
+  DVCS integration.
 product_section: dev
 product_stage: ecosystem
 product_group: group::integration
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
index c5a8b0cf75e25..d28e4295dcf38 100644
--- a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
@@ -1,7 +1,8 @@
 ---
 data_category: operational
 key_path: usage_activity_by_stage_monthly.plan.projects_jira_dvcs_server_active
-description: Distinct count of creator_id from projects with an active Jira Server DVCS integration.
+description: Distinct count of creator_id from projects with an active Jira Server
+  DVCS integration.
 product_section: dev
 product_stage: ecosystem
 product_group: group::integration
@@ -18,4 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181158_epics.yml b/config/metrics/counts_28d/20210216181158_epics.yml
index 9ede1ef12f8e3..c9bb535f3cdbe 100644
--- a/config/metrics/counts_28d/20210216181158_epics.yml
+++ b/config/metrics/counts_28d/20210216181158_epics.yml
@@ -17,3 +17,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181200_label_lists.yml b/config/metrics/counts_28d/20210216181200_label_lists.yml
index f7eaf2bf48436..091a0138cf705 100644
--- a/config/metrics/counts_28d/20210216181200_label_lists.yml
+++ b/config/metrics/counts_28d/20210216181200_label_lists.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
index 285f837178597..ce25144a574b4 100644
--- a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_title_changed
+  - g_project_management_issue_title_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
index 554bc86cada47..972fd1b6f4162 100644
--- a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_description_changed
+  - g_project_management_issue_description_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
index 07fa4ceaa3c73..503b4aff95bd6 100644
--- a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_assignee_changed
+  - g_project_management_issue_assignee_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
index 5417ffe24339d..a861ee461ee95 100644
--- a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_made_confidential
+  - g_project_management_issue_made_confidential
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
index f7c63e9bd03e4..6d494397b8bd3 100644
--- a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
+++ b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_made_visible
+  - g_project_management_issue_made_visible
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
index a0b173e5c379d..0640c7cb6be36 100644
--- a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_created
+  - g_project_management_issue_created
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
index 7ff662b246682..1be3e1a1ead05 100644
--- a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_closed
+  - g_project_management_issue_closed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
index f6b3b824afdad..22ca1ca1924e9 100644
--- a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_reopened
+  - g_project_management_issue_reopened
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
index a84dcac22d9b0..3e2b3d4284d23 100644
--- a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_label_changed
+  - g_project_management_issue_label_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
index 12ea62b75f159..4e1c5413a7692 100644
--- a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_milestone_changed
+  - g_project_management_issue_milestone_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
index a7f631d66205f..dbe6daaacd684 100644
--- a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
+++ b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_cross_referenced
+  - g_project_management_issue_cross_referenced
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
index 1538b0cc75588..b992d1e49b404 100644
--- a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
+++ b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_moved
+  - g_project_management_issue_moved
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
index 0292694843057..b919b92d60be7 100644
--- a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
+++ b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_related
+  - g_project_management_issue_related
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
index 01c5c76867462..3ad909302e2ab 100644
--- a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
+++ b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_unrelated
+  - g_project_management_issue_unrelated
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
index ca0573ba61837..a042e57d4135a 100644
--- a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_marked_as_duplicate
+  - g_project_management_issue_marked_as_duplicate
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
index 012eaeb500132..c7922c71e8efd 100644
--- a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_locked
+  - g_project_management_issue_locked
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
index a1b800b77cfda..f9d6fc1055297 100644
--- a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_unlocked
+  - g_project_management_issue_unlocked
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
index e94d56ad8b885..63c9b3ddcd889 100644
--- a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_designs_added
+  - g_project_management_issue_designs_added
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
index 0af03218ab00d..3ae5a8f77c682 100644
--- a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
+++ b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_designs_modified
+  - g_project_management_issue_designs_modified
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
index c466a775050af..918c2bf088890 100644
--- a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_designs_removed
+  - g_project_management_issue_designs_removed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
index 29517a2573912..2a880ec0658ac 100644
--- a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_due_date_changed
+  - g_project_management_issue_due_date_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
index 6f572b3a0c9a9..2c51eed73efb1 100644
--- a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_time_estimate_changed
+  - g_project_management_issue_time_estimate_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
index 4c0717f699cb5..2bcecf80d9714 100644
--- a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_time_spent_changed
+  - g_project_management_issue_time_spent_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
index dc7775542ddfb..8b1a3e71a1570 100644
--- a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_comment_added
+  - g_project_management_issue_comment_added
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
index 27c18c21b3d43..edb098f4171b0 100644
--- a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_comment_edited
+  - g_project_management_issue_comment_edited
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
index ce0bfa86bcdf8..38729cba44ad1 100644
--- a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_comment_removed
+  - g_project_management_issue_comment_removed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
index 2d785856ed85b..3550a4a2d2461 100644
--- a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
+++ b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_cloned
+  - g_project_management_issue_cloned
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
index 5da5997ad6759..5bffd21c4645c 100644
--- a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
@@ -13,39 +13,39 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_title_changed
-    - g_project_management_issue_description_changed
-    - g_project_management_issue_assignee_changed
-    - g_project_management_issue_made_confidential
-    - g_project_management_issue_made_visible
-    - g_project_management_issue_created
-    - g_project_management_issue_closed
-    - g_project_management_issue_reopened
-    - g_project_management_issue_label_changed
-    - g_project_management_issue_milestone_changed
-    - g_project_management_issue_iteration_changed
-    - g_project_management_issue_weight_changed
-    - g_project_management_issue_cross_referenced
-    - g_project_management_issue_moved
-    - g_project_management_issue_related
-    - g_project_management_issue_unrelated
-    - g_project_management_issue_marked_as_duplicate
-    - g_project_management_issue_locked
-    - g_project_management_issue_unlocked
-    - g_project_management_issue_added_to_epic
-    - g_project_management_issue_removed_from_epic
-    - g_project_management_issue_changed_epic
-    - g_project_management_issue_designs_added
-    - g_project_management_issue_designs_modified
-    - g_project_management_issue_designs_removed
-    - g_project_management_issue_due_date_changed
-    - g_project_management_issue_time_estimate_changed
-    - g_project_management_issue_time_spent_changed
-    - g_project_management_issue_comment_added
-    - g_project_management_issue_comment_edited
-    - g_project_management_issue_comment_removed
-    - g_project_management_issue_health_status_changed
-    - g_project_management_issue_cloned
+  - g_project_management_issue_title_changed
+  - g_project_management_issue_description_changed
+  - g_project_management_issue_assignee_changed
+  - g_project_management_issue_made_confidential
+  - g_project_management_issue_made_visible
+  - g_project_management_issue_created
+  - g_project_management_issue_closed
+  - g_project_management_issue_reopened
+  - g_project_management_issue_label_changed
+  - g_project_management_issue_milestone_changed
+  - g_project_management_issue_iteration_changed
+  - g_project_management_issue_weight_changed
+  - g_project_management_issue_cross_referenced
+  - g_project_management_issue_moved
+  - g_project_management_issue_related
+  - g_project_management_issue_unrelated
+  - g_project_management_issue_marked_as_duplicate
+  - g_project_management_issue_locked
+  - g_project_management_issue_unlocked
+  - g_project_management_issue_added_to_epic
+  - g_project_management_issue_removed_from_epic
+  - g_project_management_issue_changed_epic
+  - g_project_management_issue_designs_added
+  - g_project_management_issue_designs_modified
+  - g_project_management_issue_designs_removed
+  - g_project_management_issue_due_date_changed
+  - g_project_management_issue_time_estimate_changed
+  - g_project_management_issue_time_spent_changed
+  - g_project_management_issue_comment_added
+  - g_project_management_issue_comment_edited
+  - g_project_management_issue_comment_removed
+  - g_project_management_issue_health_status_changed
+  - g_project_management_issue_cloned
 distribution:
 - ce
 - ee
@@ -57,3 +57,4 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+milestone: "<13.9"
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 452d83dec1b1b..6cc4b21d5945f 100644
--- a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
+++ b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
@@ -13,11 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_approve
-instrumentation_class: RedisHLLMetric
-options:
-  events:
-    - i_quickactions_approve
+  - i_quickactions_approve
 distribution:
 - ce
 - ee
@@ -25,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
index 1e213eeb7784b..5f5cd80ebece9 100644
--- a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
+++ b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_single_monthly
-description: Count of MAU using the `/assign @user1` quick action to assign a single individual to an issuable 
+description: Count of MAU using the `/assign @user1` quick action to assign a single
+  individual to an issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_assign_single
+  - i_quickactions_assign_single
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
index 10f38fbcb9c0a..647edb7f79ef5 100644
--- a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
+++ b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_self_monthly
-description: Count of MAU using the `/assign me` quick action to assign self to an issuable 
+description: Count of MAU using the `/assign me` quick action to assign self to an
+  issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_assign_self
+  - i_quickactions_assign_self
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
index f93512081728c..17b962509e00d 100644
--- a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_reviewer_monthly
-description: Count of MAU using the `/assign_reviewer` or `request_reviewer` quick action
+description: Count of MAU using the `/assign_reviewer` or `request_reviewer` quick
+  action
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_assign_reviewer
+  - i_quickactions_assign_reviewer
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
index 90ea87a63cf72..49e558159b223 100644
--- a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
+++ b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_award_monthly
-description: Count of MAU using the `/award` quick action to set an award emoji on an issuable 
+description: Count of MAU using the `/award` quick action to set an award emoji on
+  an issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_award
+  - i_quickactions_award
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
index cc86c66caf6f8..f001639e500a9 100644
--- a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_board_move
+  - i_quickactions_board_move
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
index 0f7ad1b15cc07..32de3dfdbac3a 100644
--- a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_clone
+  - i_quickactions_clone
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
index 4750bc1412e98..bb2152d92b10a 100644
--- a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
+++ b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_close
+  - i_quickactions_close
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
index 843f00bda2806..5260dfd1a3021 100644
--- a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_confidential_monthly
-description: Count of MAU using the `/confidential` quick action to set an issue as confidential
+description: Count of MAU using the `/confidential` quick action to set an issue as
+  confidential
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_confidential
+  - i_quickactions_confidential
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
index 41e31b3031a64..30871aeb45f7c 100644
--- a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_copy_metadata_merge_request
+  - i_quickactions_copy_metadata_merge_request
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
index 861bb1ac02b3c..48042d37988fa 100644
--- a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/copy_metadata` quick action on an issue
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_copy_metadata_issue
+  - i_quickactions_copy_metadata_issue
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
index ec09f5a3269d1..538afb8ff9668 100644
--- a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_create_merge_request_monthly
-description: Count of MAU using the `/create_merge_request` quick action 
+description: Count of MAU using the `/create_merge_request` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_create_merge_request
+  - i_quickactions_create_merge_request
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
index 84b7359359ad1..86a709dcbb6ae 100644
--- a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
+++ b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_done
+  - i_quickactions_done
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
index d503f9c56b767..1da63a62dbe87 100644
--- a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_draft_monthly
 description: Count of MAU using the `/draft` quick action on a Merge Request
 product_section: dev
 product_stage: create
-product_group: group::source code 
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_draft
+  - i_quickactions_draft
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
index d1e18f0e07266..d3c1f64cee505 100644
--- a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
+++ b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_due_monthly
-description: Count of MAU using the `/due` quick action to change the due date on an issuable 
+description: Count of MAU using the `/due` quick action to change the due date on
+  an issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_due
+  - i_quickactions_due
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
index eb8e1f504d95d..44f1f026349fc 100644
--- a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_duplicate_monthly
-description: Count of MAU using the `/duplicate` quick action to mark an issue as a duplicate of another
+description: Count of MAU using the `/duplicate` quick action to mark an issue as
+  a duplicate of another
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_duplicate
+  - i_quickactions_duplicate
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
index 91c79aff0fe6f..1e932d6879607 100644
--- a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_estimate_monthly
-description: Count of MAU using the `/estimate` quick action to set a time estimate on an issue
+description: Count of MAU using the `/estimate` quick action to set a time estimate
+  on an issue
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: time_tracking 
+product_category: time_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_estimate
+  - i_quickactions_estimate
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
index 774bcc02bef64..475ebb932a99c 100644
--- a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
+++ b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/label` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_label
+  - i_quickactions_label
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
index 13aeb663c87a3..804d6507d892f 100644
--- a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_lock_monthly
-description: Count of MAU using the `/lock` quick action 
+description: Count of MAU using the `/lock` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_lock
+  - i_quickactions_lock
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
index 64f987ae88944..7d42072eaab87 100644
--- a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
+++ b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_merge_monthly
 description: Count of MAU using the `/merge` quick action
 product_section: dev
 product_stage: create
-product_group: group::source code 
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_merge
+  - i_quickactions_merge
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
index 7865b63c6eaf0..30d76be62b003 100644
--- a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_milestone_monthly
-description: Count of MAU using the `/milestone` quick action 
-product_section: dev 
+description: Count of MAU using the `/milestone` quick action
+product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_milestone
+  - i_quickactions_milestone
 distribution:
 - ce
 - ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
index d57b4cb31af75..e7a0f7c6eba2d 100644
--- a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_move
+  - i_quickactions_move
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
index 5b7a8a6a4c849..d5b8ad343bf81 100644
--- a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
+++ b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/reassign @user1` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_reassign
+  - i_quickactions_reassign
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
index 1da59b2b52385..71ea51bfdadfd 100644
--- a/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_reassign_reviewer
+  - i_quickactions_reassign_reviewer
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
index b49f8796179b9..2a0d4e5aac7da 100644
--- a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
+++ b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_rebase_monthly
 description: Count of MAU using the `/rebase` quick action on a Merge Request
 product_section: dev
-product_stage: source_code 
-product_group: group::source code 
+product_stage: source_code
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_rebase
+  - i_quickactions_rebase
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
index 287bb72a37f8e..240555a37df57 100644
--- a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
+++ b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/relabel` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_relabel
+  - i_quickactions_relabel
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
index acaf337896634..d14f5c2e70105 100644
--- a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/relate` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_relate
+  - i_quickactions_relate
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
index 1bf024eb356f7..e12a4af803b01 100644
--- a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
+++ b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/remove_due_date` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_due_date
+  - i_quickactions_remove_due_date
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
index 4e878c9c37c0f..8ac469cbb143d 100644
--- a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_estimate_monthly
-description: Count of MAU using the `/remove_estimate` quick action 
+description: Count of MAU using the `/remove_estimate` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: time_tracking 
+product_category: time_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_estimate
+  - i_quickactions_remove_estimate
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
index d2cd09a7d2b4d..eb7616a06622e 100644
--- a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_milestone_monthly
-description: Count of MAU using the `/remove_milestone` quick action 
+description: Count of MAU using the `/remove_milestone` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_milestone
+  - i_quickactions_remove_milestone
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
index 58f7ef809c4f8..cc9a951d8268a 100644
--- a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
+++ b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_time_spent
+  - i_quickactions_remove_time_spent
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
index a9e53de5c8fdc..864a173ba6b1f 100644
--- a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_zoom_monthly
-description: Count of MAU using the `/remove_zoom` quick action 
+description: Count of MAU using the `/remove_zoom` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_zoom
+  - i_quickactions_remove_zoom
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate 
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
index 6a104d2e1cbc5..7407773b2d886 100644
--- a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
+++ b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_reopen_monthly
-description: Count of MAU using the `/reopen` quick action 
+description: Count of MAU using the `/reopen` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_reopen
+  - i_quickactions_reopen
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
index d4ebe27abec71..3ab43d4f64a2e 100644
--- a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
+++ b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_shrug_monthly
-description: Count of MAU using the `/shrug` quick action 
+description: Count of MAU using the `/shrug` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_shrug
+  - i_quickactions_shrug
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
index fb0bfcb8f0166..a32b05b09acc6 100644
--- a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
+++ b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_subtract_monthly
-description: Count of MAU using the `/spend` quick action to subtract time spent 
+description: Count of MAU using the `/spend` quick action to subtract time spent
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: time_tracking 
+product_category: time_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_spend_subtract
+  - i_quickactions_spend_subtract
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate
\ No newline at end of file
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
index dbd94c3048883..b1a1a6cba16e7 100644
--- a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
+++ b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_add_monthly
-description: Count of MAU using the `/spend` quick action to add time spent 
+description: Count of MAU using the `/spend` quick action to add time spent
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_spend_add
+  - i_quickactions_spend_add
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
index 0058aa315c832..15b3cada1dee0 100644
--- a/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_submit_review
+  - i_quickactions_submit_review
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate 
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
index 7aa266017b46d..11e02d96afcf2 100644
--- a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_subscribe_monthly
-description: Count of MAU using the `/subscribe` quick action 
+description: Count of MAU using the `/subscribe` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_subscribe
+  - i_quickactions_subscribe
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
index c8695b2776ec1..69def16931191 100644
--- a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_tableflip_monthly
-description: Count of MAU using the `/tableflip` quick action 
+description: Count of MAU using the `/tableflip` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_tableflip
+  - i_quickactions_tableflip
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate
\ No newline at end of file
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
index de74bb6f7b0a3..b51f783842d6e 100644
--- a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
+++ b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_tag_monthly
-description: Count of MAU using the `/tag` quick action 
+description: Count of MAU using the `/tag` quick action
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_tag
+  - i_quickactions_tag
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
index 7de88a3068915..0f815ecec4e14 100644
--- a/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
+++ b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_target_branch_monthly
 description: Count of MAU using the `/target_branch` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::source code 
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_target_branch
+  - i_quickactions_target_branch
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
index fb94d9581f8eb..44187db1e528f 100644
--- a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_title_monthly
-description: Count of MAU using the `/title` quick action 
+description: Count of MAU using the `/title` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_title
+  - i_quickactions_title
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
index c101c389dfe57..81e9f5368b635 100644
--- a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_todo_monthly
-description: Count of MAU using the `/todo` quick action 
+description: Count of MAU using the `/todo` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_todo
+  - i_quickactions_todo
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
index 98e0b1bdff38a..6faa84138c7b6 100644
--- a/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unassign_specific
+  - i_quickactions_unassign_specific
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
index 502bc6bccfad4..4f1a3c6f0e4ca 100644
--- a/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unassign_all
+  - i_quickactions_unassign_all
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
index 1e3ea5daac895..e8ea81ea5a3e6 100644
--- a/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
@@ -1,10 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unassign_reviewer_monthly
-description: Count of MAU using the `/unassign_reviewer` or `/remove_reviewer` quick action on Merge Requests
+description: Count of MAU using the `/unassign_reviewer` or `/remove_reviewer` quick
+  action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::code review 
+product_group: group::code review
 product_category: code_review
 value_type: number
 status: data_available
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unassign_reviewer
+  - i_quickactions_unassign_reviewer
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
index d8f3ece625fe4..28cb71fcb69b7 100644
--- a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_specific_monthly
-description: Count of MAU using the `/unlabel` or `/remove_label` quick action to remove one or more specific labels
+description: Count of MAU using the `/unlabel` or `/remove_label` quick action to
+  remove one or more specific labels
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unlabel_specific
+  - i_quickactions_unlabel_specific
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
index df3403f9f0a06..2db43ebe33560 100644
--- a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unlabel_all
+  - i_quickactions_unlabel_all
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
index 4fa69c643c95b..d5674d0165c0a 100644
--- a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unlock
+  - i_quickactions_unlock
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
index f3add38826d3d..0e88fb566418c 100644
--- a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unsubscribe
+  - i_quickactions_unsubscribe
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
index 2aa277a0163e2..05b839247c2d2 100644
--- a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_wip_monthly
 description: Count of MAU using the `/wip` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::source code 
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_wip
+  - i_quickactions_wip
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
index b6ff94e5367ee..6efe8e2a01d9a 100644
--- a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_zoom_monthly
-description: Count of MAU using the `/zoom` quick action on Issues 
+description: Count of MAU using the `/zoom` quick action on Issues
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_zoom
+  - i_quickactions_zoom
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181923_successful_deployments.yml b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
index 45b50f20720c2..f5cb131f6dcf9 100644
--- a/config/metrics/counts_28d/20210216181923_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181924_failed_deployments.yml b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
index a7f0d6e584778..1361106bfd479 100644
--- a/config/metrics/counts_28d/20210216181924_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181935_deployments.yml b/config/metrics/counts_28d/20210216181935_deployments.yml
index 01978e14de0ba..547922fe9fafd 100644
--- a/config/metrics/counts_28d/20210216181935_deployments.yml
+++ b/config/metrics/counts_28d/20210216181935_deployments.yml
@@ -19,3 +19,4 @@ tier:
 skip_validation: true
 performance_indicator_type:
 - smau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181937_failed_deployments.yml b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
index 0bf293cef7227..ae2771838b5ac 100644
--- a/config/metrics/counts_28d/20210216181937_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181939_releases.yml b/config/metrics/counts_28d/20210216181939_releases.yml
index 858b760e464a9..e0b49469ea661 100644
--- a/config/metrics/counts_28d/20210216181939_releases.yml
+++ b/config/metrics/counts_28d/20210216181939_releases.yml
@@ -21,3 +21,4 @@ skip_validation: true
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181941_successful_deployments.yml b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
index 1d3a5f23cfd29..0b02cb1a9fc0a 100644
--- a/config/metrics/counts_28d/20210216181941_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
index e515792f124f2..d412ef85d5c35 100644
--- a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
+++ b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
@@ -9,7 +9,7 @@ product_category: runner
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml b/config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml
index 8c659619dfcb1..3f9b12bb8f7f0 100644
--- a/config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml
+++ b/config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml
@@ -1,15 +1,15 @@
 ---
 data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.user_unique_users_all_secure_scanners
-description: 
+description:
 product_section: sec
-product_stage: 
+product_stage:
 product_group: group::secure
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
@@ -17,3 +17,4 @@ tier:
 skip_validation: true
 performance_indicator_type:
 - smau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182034_deploy_keys.yml b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
index f6949e85a5b95..f076d4912baac 100644
--- a/config/metrics/counts_28d/20210216182034_deploy_keys.yml
+++ b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182036_keys.yml b/config/metrics/counts_28d/20210216182036_keys.yml
index ca77b038a1e23..44aa4d871ebb5 100644
--- a/config/metrics/counts_28d/20210216182036_keys.yml
+++ b/config/metrics/counts_28d/20210216182036_keys.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
index 340ce92ad800b..87c4714a7ca51 100644
--- a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
+++ b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.create.remote_mirrors
-description: Count of users creating projects with remote mirrors. Includes both push and pull mirrors.
+description: Count of users creating projects with remote mirrors. Includes both push
+  and pull mirrors.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
index cf40c69e2767b..e1a4788e27deb 100644
--- a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
+++ b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
@@ -21,3 +21,4 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
index a37ec1225fff2..9ea3514702ce4 100644
--- a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
+++ b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182051_protected_branches.yml b/config/metrics/counts_28d/20210216182051_protected_branches.yml
index 9e1afb8146cd4..d4d4b59276a39 100644
--- a/config/metrics/counts_28d/20210216182051_protected_branches.yml
+++ b/config/metrics/counts_28d/20210216182051_protected_branches.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.create.protected_branches
-description: Count of users creating projects with repositories making use of at least one protected branch in last 28 days.
+description: Count of users creating projects with repositories making use of at least
+  one protected branch in last 28 days.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
index b34c2a44a8c6c..e923f8f500a76 100644
--- a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
index b08d1181b0a78..0348e04eeb85b 100644
--- a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
index c766eb7159655..0f79d080205ce 100644
--- a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.source_code.project_action_monthly
-description: Count of unique actions done on projects and related resources (create, edit, delete, comment)
+description: Count of unique actions done on projects and related resources (create,
+  edit, delete, comment)
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml b/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml
index 7d1f7d333f29b..6d63d5ffacd7f 100644
--- a/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml
+++ b/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml
@@ -20,3 +20,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml b/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml
index e600c877c7bfd..2f6b4c6c04bc8 100644
--- a/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml
+++ b/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml
@@ -20,3 +20,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182129_sast_pipeline.yml b/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
index 8d45c30477999..14e3cd5e3e66f 100644
--- a/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
+++ b/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml b/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
index ff1067285ded6..cb2002851ff60 100644
--- a/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
+++ b/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
index 396f953439326..e2835deaeae58 100644
--- a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
+++ b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
@@ -14,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_testing_test_case_parsed
+  - i_testing_test_case_parsed
 distribution:
 - ce
 - ee
@@ -23,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
index 4d09eb0b37633..4f872e77b6176 100644
--- a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
+++ b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts_monthly.projects_with_alerts_created
 description: Monthly count of unique projects with HTTP alerting enabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
index d059bcd802214..16749f33b9ad9 100644
--- a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
+++ b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183629_two-factor.yml b/config/metrics/counts_28d/20210216183629_two-factor.yml
index 4d4603818eb10..b0c3a35e44af8 100644
--- a/config/metrics/counts_28d/20210216183629_two-factor.yml
+++ b/config/metrics/counts_28d/20210216183629_two-factor.yml
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 fe24823cdd6ea..faf8accfd67ea 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
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 95176ccabe54e..fc9cd55deaa68 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
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183634_standard.yml b/config/metrics/counts_28d/20210216183634_standard.yml
index 172fa780a6905..646c6a14acc12 100644
--- a/config/metrics/counts_28d/20210216183634_standard.yml
+++ b/config/metrics/counts_28d/20210216183634_standard.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183636_google_oauth2.yml b/config/metrics/counts_28d/20210216183636_google_oauth2.yml
index 1fdccd1721785..1abd4c17a6b38 100644
--- a/config/metrics/counts_28d/20210216183636_google_oauth2.yml
+++ b/config/metrics/counts_28d/20210216183636_google_oauth2.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 063c16fefef64..ffebb3b62b104 100644
--- a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
+++ b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
@@ -20,3 +20,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183640_gitlab.yml b/config/metrics/counts_28d/20210216183640_gitlab.yml
index 139184cc8ac4d..6b074612937c4 100644
--- a/config/metrics/counts_28d/20210216183640_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183640_gitlab.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
index dc8dec74ef38f..82f48f168cc10 100644
--- a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
+++ b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183644_gitlab_project.yml b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
index 394d85b4863f9..82c60d0091d02 100644
--- a/config/metrics/counts_28d/20210216183644_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183646_gitlab.yml b/config/metrics/counts_28d/20210216183646_gitlab.yml
index 84a6387fbf5cf..59d7247576c8d 100644
--- a/config/metrics/counts_28d/20210216183646_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183646_gitlab.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183648_github.yml b/config/metrics/counts_28d/20210216183648_github.yml
index d7ad93520a7ce..7e13997258333 100644
--- a/config/metrics/counts_28d/20210216183648_github.yml
+++ b/config/metrics/counts_28d/20210216183648_github.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183650_bitbucket.yml b/config/metrics/counts_28d/20210216183650_bitbucket.yml
index c702f1a065fc3..f19b9dbb41066 100644
--- a/config/metrics/counts_28d/20210216183650_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183650_bitbucket.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
index 0781ceca40fb0..57fc8ec66aea7 100644
--- a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183653_gitea.yml b/config/metrics/counts_28d/20210216183653_gitea.yml
index f5909eb7475a7..d9729b1fa1fc0 100644
--- a/config/metrics/counts_28d/20210216183653_gitea.yml
+++ b/config/metrics/counts_28d/20210216183653_gitea.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183655_git.yml b/config/metrics/counts_28d/20210216183655_git.yml
index 68738e36ddd3a..087ce7bc3d8c9 100644
--- a/config/metrics/counts_28d/20210216183655_git.yml
+++ b/config/metrics/counts_28d/20210216183655_git.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183657_manifest.yml b/config/metrics/counts_28d/20210216183657_manifest.yml
index d93467a39657c..83ddd8d1f4238 100644
--- a/config/metrics/counts_28d/20210216183657_manifest.yml
+++ b/config/metrics/counts_28d/20210216183657_manifest.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
index 40f4965f8a041..6408e490753de 100644
--- a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183701_jira.yml b/config/metrics/counts_28d/20210216183701_jira.yml
index cb6c808fb908c..1df00f149c3f2 100644
--- a/config/metrics/counts_28d/20210216183701_jira.yml
+++ b/config/metrics/counts_28d/20210216183701_jira.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183703_fogbugz.yml b/config/metrics/counts_28d/20210216183703_fogbugz.yml
index e3369043e7416..460d47d5d03f0 100644
--- a/config/metrics/counts_28d/20210216183703_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183703_fogbugz.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183705_phabricator.yml b/config/metrics/counts_28d/20210216183705_phabricator.yml
index 57bf3e5abf36d..889490dcd3143 100644
--- a/config/metrics/counts_28d/20210216183705_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183705_phabricator.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183707_csv.yml b/config/metrics/counts_28d/20210216183707_csv.yml
index 703edf02f76d9..8f8c70ac760b7 100644
--- a/config/metrics/counts_28d/20210216183707_csv.yml
+++ b/config/metrics/counts_28d/20210216183707_csv.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183709_group_import.yml b/config/metrics/counts_28d/20210216183709_group_import.yml
index bbe9da3175c39..8247281652486 100644
--- a/config/metrics/counts_28d/20210216183709_group_import.yml
+++ b/config/metrics/counts_28d/20210216183709_group_import.yml
@@ -11,9 +11,10 @@ status: data_available
 time_frame: 28d
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
index 1a517169eeb06..114ba1d41fb02 100644
--- a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183712_total.yml b/config/metrics/counts_28d/20210216183712_total.yml
index 8942de0f9b8ae..6df8278609777 100644
--- a/config/metrics/counts_28d/20210216183712_total.yml
+++ b/config/metrics/counts_28d/20210216183712_total.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183714_gitlab_project.yml b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
index e8d1204d428fb..65b7f08ee9b00 100644
--- a/config/metrics/counts_28d/20210216183714_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183716_gitlab.yml b/config/metrics/counts_28d/20210216183716_gitlab.yml
index b5ad788c6d005..78113f063ca69 100644
--- a/config/metrics/counts_28d/20210216183716_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183716_gitlab.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183718_github.yml b/config/metrics/counts_28d/20210216183718_github.yml
index a476a1034584a..caa2602d5fa8e 100644
--- a/config/metrics/counts_28d/20210216183718_github.yml
+++ b/config/metrics/counts_28d/20210216183718_github.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183720_bitbucket.yml b/config/metrics/counts_28d/20210216183720_bitbucket.yml
index 4c3a0bd372143..c9e54883e3f1b 100644
--- a/config/metrics/counts_28d/20210216183720_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183720_bitbucket.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
index 82bcde1b2eea8..7b81f7bf2dd10 100644
--- a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183724_gitea.yml b/config/metrics/counts_28d/20210216183724_gitea.yml
index df1d3c5b01249..9a8c27cae3fb6 100644
--- a/config/metrics/counts_28d/20210216183724_gitea.yml
+++ b/config/metrics/counts_28d/20210216183724_gitea.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183726_git.yml b/config/metrics/counts_28d/20210216183726_git.yml
index 7e711694253b7..b044fd6f4938e 100644
--- a/config/metrics/counts_28d/20210216183726_git.yml
+++ b/config/metrics/counts_28d/20210216183726_git.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183728_manifest.yml b/config/metrics/counts_28d/20210216183728_manifest.yml
index 3c935d604fa9c..56d47b288f31c 100644
--- a/config/metrics/counts_28d/20210216183728_manifest.yml
+++ b/config/metrics/counts_28d/20210216183728_manifest.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183730_jira.yml b/config/metrics/counts_28d/20210216183730_jira.yml
index 488b4b4c19e99..1a51229d107a9 100644
--- a/config/metrics/counts_28d/20210216183730_jira.yml
+++ b/config/metrics/counts_28d/20210216183730_jira.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183731_fogbugz.yml b/config/metrics/counts_28d/20210216183731_fogbugz.yml
index 2239c83696d2d..53cfec950c285 100644
--- a/config/metrics/counts_28d/20210216183731_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183731_fogbugz.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183733_phabricator.yml b/config/metrics/counts_28d/20210216183733_phabricator.yml
index 903a06793e1f2..07b95a6066ce4 100644
--- a/config/metrics/counts_28d/20210216183733_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183733_phabricator.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183735_csv.yml b/config/metrics/counts_28d/20210216183735_csv.yml
index 2890302b24a18..afdafb3c50713 100644
--- a/config/metrics/counts_28d/20210216183735_csv.yml
+++ b/config/metrics/counts_28d/20210216183735_csv.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183737_groups_imported.yml b/config/metrics/counts_28d/20210216183737_groups_imported.yml
index b2a53befda21e..0de2e16e661a0 100644
--- a/config/metrics/counts_28d/20210216183737_groups_imported.yml
+++ b/config/metrics/counts_28d/20210216183737_groups_imported.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
index 3987df0e7eb6d..91cbe6f1af5e3 100644
--- a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
@@ -1,7 +1,10 @@
 ---
 data_category: optional
 key_path: search_unique_visits.search_unique_visits_for_any_target_monthly
-description: Total unique users for i_search_total, i_search_advanced, i_search_paid for recent 28 days. This metric is redundant because advanced will be a subset of paid and paid will be a subset of total. i_search_total is more appropriate if you just want the total
+description: Total unique users for i_search_total, i_search_advanced, i_search_paid
+  for recent 28 days. This metric is redundant because advanced will be a subset of
+  paid and paid will be a subset of total. i_search_total is more appropriate if you
+  just want the total
 product_section: enablement
 product_stage: enablement
 product_group: group::global search
@@ -13,9 +16,9 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_search_total
-    - i_search_advanced
-    - i_search_paid
+  - i_search_total
+  - i_search_advanced
+  - i_search_paid
 distribution:
 - ce
 - ee
@@ -23,3 +26,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 fe05044105ad5..4726da80f2f8a 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
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
index e47c1d8b72993..123d1009d2ae0 100644
--- a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
index be9420ef8cdd5..e8968722dd8be 100644
--- a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
@@ -13,19 +13,20 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_testing_test_case_parsed
-    - i_testing_metrics_report_widget_total
-    - i_testing_group_code_coverage_visit_total
-    - i_testing_full_code_quality_report_total
-    - i_testing_web_performance_widget_total
-    - i_testing_group_code_coverage_project_click_total
-    - i_testing_load_performance_widget_total
-    - i_testing_metrics_report_artifact_uploaders
-    - i_testing_summary_widget_total
-    - users_expanding_testing_code_quality_report
-    - users_expanding_testing_accessibility_report
+  - i_testing_test_case_parsed
+  - i_testing_metrics_report_widget_total
+  - i_testing_group_code_coverage_visit_total
+  - i_testing_full_code_quality_report_total
+  - i_testing_web_performance_widget_total
+  - i_testing_group_code_coverage_project_click_total
+  - i_testing_load_performance_widget_total
+  - i_testing_metrics_report_artifact_uploaders
+  - i_testing_summary_widget_total
+  - users_expanding_testing_code_quality_report
+  - users_expanding_testing_accessibility_report
 distribution:
 - ce
 tier:
 - free
 performance_indicator_type: []
+milestone: "<13.9"
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 7c0bcbb795b5b..fd4ada20acb56 100644
--- a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
+++ b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_snippets_show
+  - i_snippets_show
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
index b3b3c7b6749bf..cebe0f4fee0a5 100644
--- a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
+++ b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_terraform_state_api_unique_users
+  - p_terraform_state_api_unique_users
 distribution:
 - ce
 - ee
@@ -25,3 +25,4 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+milestone: "<13.9"
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 ca852c74821c5..298f974295a7d 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly
-description: Monthly unique user count doing commits which contains the CI config file
+description: Monthly unique user count doing commits which contains the CI config
+  file
 product_section: ops
 product_stage: verify
 product_group: group::pipeline authoring
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - o_pipeline_authoring_unique_users_committing_ciconfigfile
+  - o_pipeline_authoring_unique_users_committing_ciconfigfile
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
index 1307111cc3cb0..22e1dc89ecf6f 100644
--- a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
+++ b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_toggled_task_item_status
+  - i_code_review_user_toggled_task_item_status
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
index a2e858cd88669..06d07cd0a1f90 100644
--- a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_approve_mr
+  - i_code_review_user_approve_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
index 583978e9bd669..675942f8a3027 100644
--- a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_unapprove_mr
+  - i_code_review_user_unapprove_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
index 0828587051e00..0f943b0eeec34 100644
--- a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_resolve_thread
+  - i_code_review_user_resolve_thread
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
index fe195544df455..a39785eb250fc 100644
--- a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_unresolve_thread
+  - i_code_review_user_unresolve_thread
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
index 0bd8573477bc0..750030701ca2d 100644
--- a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_edit_mr_title
+  - i_code_review_edit_mr_title
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
index ba30f3aad308f..545971519eb35 100644
--- a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
+++ b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_edit_mr_desc
+  - i_code_review_edit_mr_desc
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
index f948c01170f41..aab964e0ad3eb 100644
--- a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
+++ b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_review_note_monthly
-description: Count of unique users per month who create a note as part of a merge request review
+description: Count of unique users per month who create a note as part of a merge
+  request review
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_review_note
+  - i_code_review_user_create_review_note
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
index 478ae4bef09d8..57d0a40be566b 100644
--- a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_publish_review_monthly
-description: Count of unique users per month who publish their review as part of a merge request review
+description: Count of unique users per month who publish their review as part of a
+  merge request review
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_publish_review
+  - i_code_review_user_publish_review
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
index 7e5ccc54f67ae..3669febc3b658 100644
--- a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_multiline_mr_comment_monthly
-description: Count of unique users per month who create a multiline comment in a merge request
+description: Count of unique users per month who create a multiline comment in a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_multiline_mr_comment
+  - i_code_review_user_create_multiline_mr_comment
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
index 59def107ab6c1..841b684c90163 100644
--- a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_edit_multiline_mr_comment_monthly
-description: Count of unique users per week who edit a multiline comment in a merge request
+description: Count of unique users per week who edit a multiline comment in a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_edit_multiline_mr_comment
+  - i_code_review_user_edit_multiline_mr_comment
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
index ec940edea178f..ae50ab0a27f02 100644
--- a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_remove_multiline_mr_comment_monthly
-description: Count of unique users per month who remove a multiline comment in a merge request
+description: Count of unique users per month who remove a multiline comment in a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_remove_multiline_mr_comment
+  - i_code_review_user_remove_multiline_mr_comment
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
index 2e4b9bffb9fc0..9497033db45e2 100644
--- a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_assigned
+  - i_code_review_user_assigned
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
index bf49cac8446a8..2cb3ab242694d 100644
--- a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_marked_as_draft
+  - i_code_review_user_marked_as_draft
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
index 746e9ed6f2f07..3d0b22eff1b88 100644
--- a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_unmarked_as_draft
+  - i_code_review_user_unmarked_as_draft
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
index a93b38a14ec37..5be14acc358e8 100644
--- a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
+++ b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_review_requested
+  - i_code_review_user_review_requested
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
index fec8c67a6e7f7..e38b274195419 100644
--- a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_approval_rule_added
+  - i_code_review_user_approval_rule_added
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
index c33697d892537..0fd568681c8b3 100644
--- a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
+++ b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_deleted_monthly
-description: Count of unique users per month who delete an approval rule to a merge request
+description: Count of unique users per month who delete an approval rule to a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_approval_rule_deleted
+  - i_code_review_user_approval_rule_deleted
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
index c46191814feca..e159663d14c75 100644
--- a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_edited_monthly
-description: Count of unique users per month who delete an approval rule to a merge request
+description: Count of unique users per month who delete an approval rule to a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_approval_rule_edited
+  - i_code_review_user_approval_rule_edited
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
index d4f72aab3eb04..d8ac193b82260 100644
--- a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
@@ -12,7 +12,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_vs_code_api_request
+  - i_code_review_user_vs_code_api_request
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
index 3a672ceb92faa..6f9ef7d5a670c 100644
--- a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
@@ -12,15 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_mr_from_issue
-instrumentation_class: RedisHLLMetric
-options:
-  events:
-    - i_code_review_user_create_mr
+  - i_code_review_user_create_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
index 2b6e1c978d7c0..46e7eb0bb9b22 100644
--- a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
@@ -12,62 +12,62 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_mr_diffs
-    - i_code_review_user_single_file_diffs
-    - i_code_review_mr_single_file_diffs
-    - i_code_review_user_toggled_task_item_status
-    - i_code_review_user_create_mr
-    - i_code_review_user_close_mr
-    - i_code_review_user_reopen_mr
-    - i_code_review_user_approve_mr
-    - i_code_review_user_unapprove_mr
-    - i_code_review_user_resolve_thread
-    - i_code_review_user_unresolve_thread
-    - i_code_review_edit_mr_title
-    - i_code_review_edit_mr_desc
-    - i_code_review_user_merge_mr
-    - i_code_review_user_create_mr_comment
-    - i_code_review_user_edit_mr_comment
-    - i_code_review_user_remove_mr_comment
-    - i_code_review_user_create_review_note
-    - i_code_review_user_publish_review
-    - i_code_review_user_create_multiline_mr_comment
-    - i_code_review_user_edit_multiline_mr_comment
-    - i_code_review_user_remove_multiline_mr_comment
-    - i_code_review_user_add_suggestion
-    - i_code_review_user_apply_suggestion
-    - i_code_review_user_assigned
-    - i_code_review_user_marked_as_draft
-    - i_code_review_user_unmarked_as_draft
-    - i_code_review_user_review_requested
-    - i_code_review_user_approval_rule_added
-    - i_code_review_user_approval_rule_deleted
-    - i_code_review_user_approval_rule_edited
-    - i_code_review_user_vs_code_api_request
-    - i_code_review_user_create_mr_from_issue
-    - i_code_review_user_mr_discussion_locked
-    - i_code_review_user_mr_discussion_unlocked
-    - i_code_review_user_time_estimate_changed
-    - i_code_review_user_time_spent_changed
-    - i_code_review_user_assignees_changed
-    - 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
-    - i_code_review_diff_view_inline
-    - i_code_review_diff_view_parallel
-    - i_code_review_file_browser_tree_view
-    - i_code_review_file_browser_list_view
-    - i_code_review_diff_show_whitespace
-    - 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
-    - i_code_review_user_searches_diff
+  - i_code_review_mr_diffs
+  - i_code_review_user_single_file_diffs
+  - i_code_review_mr_single_file_diffs
+  - i_code_review_user_toggled_task_item_status
+  - i_code_review_user_create_mr
+  - i_code_review_user_close_mr
+  - i_code_review_user_reopen_mr
+  - i_code_review_user_approve_mr
+  - i_code_review_user_unapprove_mr
+  - i_code_review_user_resolve_thread
+  - i_code_review_user_unresolve_thread
+  - i_code_review_edit_mr_title
+  - i_code_review_edit_mr_desc
+  - i_code_review_user_merge_mr
+  - i_code_review_user_create_mr_comment
+  - i_code_review_user_edit_mr_comment
+  - i_code_review_user_remove_mr_comment
+  - i_code_review_user_create_review_note
+  - i_code_review_user_publish_review
+  - i_code_review_user_create_multiline_mr_comment
+  - i_code_review_user_edit_multiline_mr_comment
+  - i_code_review_user_remove_multiline_mr_comment
+  - i_code_review_user_add_suggestion
+  - i_code_review_user_apply_suggestion
+  - i_code_review_user_assigned
+  - i_code_review_user_marked_as_draft
+  - i_code_review_user_unmarked_as_draft
+  - i_code_review_user_review_requested
+  - i_code_review_user_approval_rule_added
+  - i_code_review_user_approval_rule_deleted
+  - i_code_review_user_approval_rule_edited
+  - i_code_review_user_vs_code_api_request
+  - i_code_review_user_create_mr_from_issue
+  - i_code_review_user_mr_discussion_locked
+  - i_code_review_user_mr_discussion_unlocked
+  - i_code_review_user_time_estimate_changed
+  - i_code_review_user_time_spent_changed
+  - i_code_review_user_assignees_changed
+  - 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
+  - i_code_review_diff_view_inline
+  - i_code_review_diff_view_parallel
+  - i_code_review_file_browser_tree_view
+  - i_code_review_file_browser_list_view
+  - i_code_review_diff_show_whitespace
+  - 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
+  - i_code_review_user_searches_diff
 distribution:
 - ce
 - ee
@@ -76,3 +76,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
index 0f31fe683c6d5..400542cfffe89 100644
--- a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_auto_devops
+  - p_ci_templates_implicit_auto_devops
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
index 3ac9b6f4ddcb4..9c5bf3d9d5045 100644
--- a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_auto_devops_build
+  - p_ci_templates_implicit_auto_devops_build
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
index ab0fabca342bc..367e5b8900ee2 100644
--- a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_auto_devops_deploy
+  - p_ci_templates_implicit_auto_devops_deploy
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml b/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
index 5ad9c37ea8d0a..84d998cfc6463 100644
--- a/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_security_sast
+  - p_ci_templates_implicit_security_sast
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml b/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
index 31ff83c08fadc..855a74cdd9100 100644
--- a/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_security_secret_detection
+  - p_ci_templates_implicit_security_secret_detection
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
index 2a0041f589bfc..21811eec3e734 100644
--- a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
+++ b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_mo
 description: Number of projects using 5 min production app CI template in last 7 days.
 product_section: seg
 product_stage: deploy
-product_group: "group::5-min-app"
+product_group: group::5-min-app
 product_category: five_minute_production_app
 value_type: number
 status: data_available
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_5_min_production_app
+  - p_ci_templates_5_min_production_app
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
index feb29888b98fd..19c73df2fcd62 100644
--- a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_auto_devops
+  - p_ci_templates_auto_devops
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
index 479ae0b65e789..41ec8a7cfc32e 100644
--- a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
@@ -1,10 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_cf_deploy_ec2_monthly
-description: "Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.yml` template in last 28 days."
+description: Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.yml`
+  template in last 28 days.
 product_section: ops
 product_stage: release
-product_group: "group::release"
+product_group: group::release
 product_category: continuous_delivery
 value_type: number
 status: data_available
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_aws_cf_deploy_ec2
+  - p_ci_templates_aws_cf_deploy_ec2
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
index d6e8edfc8f9aa..9771f969aaf94 100644
--- a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
@@ -1,10 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_deploy_ecs_monthly
-description: "Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in last 28 days."
+description: Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in last
+  28 days.
 product_section: ops
 product_stage: release
-product_group: "group::release"
+product_group: group::release
 product_category: continuous_delivery
 value_type: number
 status: data_available
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_aws_deploy_ecs
+  - p_ci_templates_aws_deploy_ecs
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
index 04b087c2b632e..555a9a3cdd1b4 100644
--- a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_auto_devops_build
+  - p_ci_templates_auto_devops_build
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
index c5f24824bde30..0571f374494ff 100644
--- a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_auto_devops_deploy
+  - p_ci_templates_auto_devops_deploy
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
index baac103aae1b1..bed203b73e13a 100644
--- a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_auto_devops_deploy_latest
+  - p_ci_templates_auto_devops_deploy_latest
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml b/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
index 0e072188e2a14..b55d971bea55e 100644
--- a/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_security_sast
+  - p_ci_templates_security_sast
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml b/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
index 7e9f5151a2362..922e85d268613 100644
--- a/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_security_secret_detection
+  - p_ci_templates_security_secret_detection
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
index 063b9e7c58251..c8966b080d600 100644
--- a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_terraform_base_latest
+  - p_ci_templates_terraform_base_latest
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 c036b506ac53b..8260b53734ea6 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
@@ -14,21 +14,21 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_auto_devops
-    - p_ci_templates_implicit_auto_devops_build
-    - p_ci_templates_implicit_auto_devops_deploy
-    - p_ci_templates_implicit_security_sast
-    - p_ci_templates_implicit_security_secret_detection
-    - p_ci_templates_5_min_production_app
-    - p_ci_templates_auto_devops
-    - p_ci_templates_aws_cf_deploy_ec2
-    - p_ci_templates_aws_deploy_ecs
-    - p_ci_templates_auto_devops_build
-    - p_ci_templates_auto_devops_deploy
-    - p_ci_templates_auto_devops_deploy_latest
-    - p_ci_templates_security_sast
-    - p_ci_templates_security_secret_detection
-    - p_ci_templates_terraform_base_latest
+  - p_ci_templates_implicit_auto_devops
+  - p_ci_templates_implicit_auto_devops_build
+  - p_ci_templates_implicit_auto_devops_deploy
+  - p_ci_templates_implicit_security_sast
+  - p_ci_templates_implicit_security_secret_detection
+  - p_ci_templates_5_min_production_app
+  - p_ci_templates_auto_devops
+  - p_ci_templates_aws_cf_deploy_ec2
+  - p_ci_templates_aws_deploy_ecs
+  - p_ci_templates_auto_devops_build
+  - p_ci_templates_auto_devops_deploy
+  - p_ci_templates_auto_devops_deploy_latest
+  - p_ci_templates_security_sast
+  - p_ci_templates_security_secret_detection
+  - p_ci_templates_terraform_base_latest
 distribution:
 - ce
 - ee
@@ -37,3 +37,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
index de5acc6a60c75..5768df2725cf9 100644
--- a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
@@ -3,9 +3,9 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.quickactions_total_unique_counts_monthly
 description: Count of MAU using one or more quick actions
 product_section: dev
-product_stage: plan 
-product_group: group::project management 
-product_category: issue_tracking 
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,78 +13,79 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_approve
-    - i_quickactions_assign_single
-    - i_quickactions_assign_multiple
-    - i_quickactions_assign_self
-    - i_quickactions_assign_reviewer
-    - i_quickactions_award
-    - i_quickactions_board_move
-    - i_quickactions_child_epic
-    - i_quickactions_clear_weight
-    - i_quickactions_clone
-    - i_quickactions_close
-    - i_quickactions_confidential
-    - i_quickactions_copy_metadata_merge_request
-    - i_quickactions_copy_metadata_issue
-    - i_quickactions_create_merge_request
-    - i_quickactions_done
-    - i_quickactions_draft
-    - i_quickactions_due
-    - i_quickactions_duplicate
-    - i_quickactions_epic
-    - i_quickactions_estimate
-    - i_quickactions_iteration
-    - i_quickactions_label
-    - i_quickactions_lock
-    - i_quickactions_merge
-    - i_quickactions_milestone
-    - i_quickactions_move
-    - i_quickactions_parent_epic
-    - i_quickactions_promote
-    - i_quickactions_publish
-    - i_quickactions_reassign
-    - i_quickactions_reassign_reviewer
-    - i_quickactions_rebase
-    - i_quickactions_relabel
-    - i_quickactions_relate
-    - i_quickactions_remove_child_epic
-    - i_quickactions_remove_due_date
-    - i_quickactions_remove_epic
-    - i_quickactions_remove_estimate
-    - i_quickactions_remove_iteration
-    - i_quickactions_remove_milestone
-    - i_quickactions_remove_parent_epic
-    - i_quickactions_remove_time_spent
-    - i_quickactions_remove_zoom
-    - i_quickactions_reopen
-    - i_quickactions_severity
-    - i_quickactions_shrug
-    - i_quickactions_spend_subtract
-    - i_quickactions_spend_add
-    - i_quickactions_submit_review
-    - i_quickactions_subscribe
-    - i_quickactions_tableflip
-    - i_quickactions_tag
-    - i_quickactions_target_branch
-    - i_quickactions_title
-    - i_quickactions_todo
-    - i_quickactions_unassign_specific
-    - i_quickactions_unassign_all
-    - i_quickactions_unassign_reviewer
-    - i_quickactions_unlabel_specific
-    - i_quickactions_unlabel_all
-    - i_quickactions_unlock
-    - i_quickactions_unsubscribe
-    - i_quickactions_weight
-    - i_quickactions_wip
-    - i_quickactions_zoom
-    - i_quickactions_invite_email_single
-    - i_quickactions_invite_email_multiple
+  - i_quickactions_approve
+  - i_quickactions_assign_single
+  - i_quickactions_assign_multiple
+  - i_quickactions_assign_self
+  - i_quickactions_assign_reviewer
+  - i_quickactions_award
+  - i_quickactions_board_move
+  - i_quickactions_child_epic
+  - i_quickactions_clear_weight
+  - i_quickactions_clone
+  - i_quickactions_close
+  - i_quickactions_confidential
+  - i_quickactions_copy_metadata_merge_request
+  - i_quickactions_copy_metadata_issue
+  - i_quickactions_create_merge_request
+  - i_quickactions_done
+  - i_quickactions_draft
+  - i_quickactions_due
+  - i_quickactions_duplicate
+  - i_quickactions_epic
+  - i_quickactions_estimate
+  - i_quickactions_iteration
+  - i_quickactions_label
+  - i_quickactions_lock
+  - i_quickactions_merge
+  - i_quickactions_milestone
+  - i_quickactions_move
+  - i_quickactions_parent_epic
+  - i_quickactions_promote
+  - i_quickactions_publish
+  - i_quickactions_reassign
+  - i_quickactions_reassign_reviewer
+  - i_quickactions_rebase
+  - i_quickactions_relabel
+  - i_quickactions_relate
+  - i_quickactions_remove_child_epic
+  - i_quickactions_remove_due_date
+  - i_quickactions_remove_epic
+  - i_quickactions_remove_estimate
+  - i_quickactions_remove_iteration
+  - i_quickactions_remove_milestone
+  - i_quickactions_remove_parent_epic
+  - i_quickactions_remove_time_spent
+  - i_quickactions_remove_zoom
+  - i_quickactions_reopen
+  - i_quickactions_severity
+  - i_quickactions_shrug
+  - i_quickactions_spend_subtract
+  - i_quickactions_spend_add
+  - i_quickactions_submit_review
+  - i_quickactions_subscribe
+  - i_quickactions_tableflip
+  - i_quickactions_tag
+  - i_quickactions_target_branch
+  - i_quickactions_title
+  - i_quickactions_todo
+  - i_quickactions_unassign_specific
+  - i_quickactions_unassign_all
+  - i_quickactions_unassign_reviewer
+  - i_quickactions_unlabel_specific
+  - i_quickactions_unlabel_all
+  - i_quickactions_unlock
+  - i_quickactions_unsubscribe
+  - i_quickactions_weight
+  - i_quickactions_wip
+  - i_quickactions_zoom
+  - i_quickactions_invite_email_single
+  - i_quickactions_invite_email_multiple
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate 
+- ultimate
+milestone: "<13.9"
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 27893e9a72c4a..8a74677d8f26d 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_composer_deploy_token_monthly
-description: A monthly count of Composer packages published to the registry using a deploy token
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_composer_deploy_token
+  - i_package_composer_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 f5b4a753ca32b..d7d45f39f0c5a 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_conan_deploy_token_monthly
-description: A monthly count of Conan packages published to the registry using a deploy token
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_conan_deploy_token
+  - i_package_conan_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 3da9fd8a073bc..dc08e248c4fbb 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_container_deploy_token_monthly
-description: A monthly count of container images published to the registry using a deploy token
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_container_deploy_token
+  - i_package_container_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 5bddca4b70e9d..edb282fd1a1f1 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_debian_deploy_token_monthly
-description: A monthly count of Debian packages published to the registry using a deploy token
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_debian_deploy_token
+  - i_package_debian_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 4bf549b265346..84da476edb563 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_generic_deploy_token_monthly
-description: A monthly count of generic packages published to the registry using a deploy token
+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
@@ -14,7 +15,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_generic_deploy_token
+  - i_package_generic_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 61bc69c172ab0..1e3247a7109b7 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_golang_deploy_token_monthly
-description: A monthly count of Go modules published to the registry using a deploy token
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_golang_deploy_token
+  - i_package_golang_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 d231688f19173..f113e099d9745 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_maven_deploy_token_monthly
-description: A monthly count of Maven packages published to the registry using a deploy token
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_maven_deploy_token
+  - i_package_maven_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 df745333d7194..25f4f42b7066c 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_npm_deploy_token_monthly
-description: A monthly count of npm packages published to the registry using a deploy token
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_npm_deploy_token
+  - i_package_npm_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 063530e82acf8..cd8a418506fb4 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_nuget_deploy_token_monthly
-description: A monthly count of NuGet packages published to the registry using a deploy token
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_nuget_deploy_token
+  - i_package_nuget_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 256689b29a8fc..51a7de1277d6d 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_pypi_deploy_token_monthly
-description: A monthly count of PyPI packages published to the registry using a deploy token
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_pypi_deploy_token
+  - i_package_pypi_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 52be708f79460..d465a6aff4b4b 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_tag_deploy_token_monthly
-description: A monthly count of package tags published to the registry using a deploy token
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_tag_deploy_token
+  - i_package_tag_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 5452e4399d558..c1b9ad3b64bd1 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.deploy_token_packages_total_unique_counts_monthly
-description: A monthly count of packages published to the registry using a deploy token
+description: A monthly count of packages published to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,20 +14,20 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_composer_deploy_token
-    - i_package_conan_deploy_token
-    - i_package_container_deploy_token
-    - i_package_debian_deploy_token
-    - i_package_generic_deploy_token
-    - i_package_golang_deploy_token
-    - i_package_helm_deploy_token
-    - i_package_maven_deploy_token
-    - i_package_npm_deploy_token
-    - i_package_nuget_deploy_token
-    - i_package_pypi_deploy_token
-    - i_package_rubygems_deploy_token
-    - i_package_tag_deploy_token
-    - i_package_terraform_module_deploy_token
+  - i_package_composer_deploy_token
+  - i_package_conan_deploy_token
+  - i_package_container_deploy_token
+  - i_package_debian_deploy_token
+  - i_package_generic_deploy_token
+  - i_package_golang_deploy_token
+  - i_package_helm_deploy_token
+  - i_package_maven_deploy_token
+  - i_package_npm_deploy_token
+  - i_package_nuget_deploy_token
+  - i_package_pypi_deploy_token
+  - i_package_rubygems_deploy_token
+  - i_package_tag_deploy_token
+  - i_package_terraform_module_deploy_token
 distribution:
 - ee
 - ce
@@ -35,3 +36,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 4d0c59d2568eb..0fcc456c85327 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_composer_user_monthly
-description: A monthly count of users that have published a Composer package to the registry
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_composer_user
+  - i_package_composer_user
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 83adab11d091a..e327c81af5521 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
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_conan_user
+  - i_package_conan_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 a0072e6531498..50df5df1b2583 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_container_user_monthly
-description: A monthly count of users that have published a container image to the registry
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_container_user
+  - i_package_container_user
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 22e7a1f432ae1..cb716aae07032 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_debian_user_monthly
-description: A monthly count of users that have published a Debian package to the registry
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_debian_user
+  - i_package_debian_user
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 7072e6542b8a4..f028719bfe115 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_generic_user_monthly
-description: A monthly count of users that have published a generic package to the registry
+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
@@ -14,7 +15,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_generic_user
+  - i_package_generic_user
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 7303436fe3fca..c1fcfd38e63d2 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
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_golang_user
+  - i_package_golang_user
 distribution:
 - ee
 - ce
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 c4f13984dc9e9..d24e48428af0d 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
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_maven_user
+  - i_package_maven_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 637de10004e61..4ad5a3d45c50f 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
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_npm_user
+  - i_package_npm_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 5a2f03a7b31e7..dcfdccce7fe5d 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
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_nuget_user
+  - i_package_nuget_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 fefa5363e25ac..c09f51d3e19e1 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
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_pypi_user
+  - i_package_pypi_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 9c339dae78eed..f8d411c034813 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
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_tag_user
+  - i_package_tag_user
 distribution:
 - ee
 - ce
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 59d588c543f26..c96e1d2f5dcc6 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
@@ -13,20 +13,20 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_composer_user
-    - i_package_conan_user
-    - i_package_container_user
-    - i_package_debian_user
-    - i_package_generic_user
-    - i_package_golang_user
-    - i_package_helm_user
-    - i_package_maven_user
-    - i_package_npm_user
-    - i_package_nuget_user
-    - i_package_pypi_user
-    - i_package_rubygems_user
-    - i_package_tag_user
-    - i_package_terraform_module_user
+  - i_package_composer_user
+  - i_package_conan_user
+  - i_package_container_user
+  - i_package_debian_user
+  - i_package_generic_user
+  - i_package_golang_user
+  - i_package_helm_user
+  - i_package_maven_user
+  - i_package_npm_user
+  - i_package_nuget_user
+  - i_package_pypi_user
+  - i_package_rubygems_user
+  - i_package_tag_user
+  - i_package_terraform_module_user
 distribution:
 - ee
 - ce
@@ -37,3 +37,4 @@ tier:
 performance_indicator_type:
 - smau
 - gmau
+milestone: "<13.9"
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 070a2cd71c3b9..9aa85bc0f2850 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
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_close_issue
+  - i_ecosystem_jira_service_close_issue
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 dd977ce2f4d48..48a85607a05fe 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
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_cross_reference
+  - i_ecosystem_jira_service_cross_reference
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 b36761e255d3c..7a024872b25bc 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
@@ -13,19 +13,19 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_close_issue
-    - i_ecosystem_jira_service_cross_reference
-    - i_ecosystem_jira_service_list_issues
-    - i_ecosystem_jira_service_create_issue
-    - i_ecosystem_slack_service_issue_notification
-    - i_ecosystem_slack_service_push_notification
-    - i_ecosystem_slack_service_deployment_notification
-    - i_ecosystem_slack_service_wiki_page_notification
-    - i_ecosystem_slack_service_merge_request_notification
-    - i_ecosystem_slack_service_note_notification
-    - i_ecosystem_slack_service_tag_push_notification
-    - i_ecosystem_slack_service_confidential_note_notification
-    - i_ecosystem_slack_service_confidential_issue_notification
+  - i_ecosystem_jira_service_close_issue
+  - i_ecosystem_jira_service_cross_reference
+  - i_ecosystem_jira_service_list_issues
+  - i_ecosystem_jira_service_create_issue
+  - i_ecosystem_slack_service_issue_notification
+  - i_ecosystem_slack_service_push_notification
+  - i_ecosystem_slack_service_deployment_notification
+  - i_ecosystem_slack_service_wiki_page_notification
+  - i_ecosystem_slack_service_merge_request_notification
+  - i_ecosystem_slack_service_note_notification
+  - i_ecosystem_slack_service_tag_push_notification
+  - i_ecosystem_slack_service_confidential_note_notification
+  - i_ecosystem_slack_service_confidential_issue_notification
 distribution:
 - ce
 - ee
@@ -37,3 +37,4 @@ performance_indicator_type:
 - gmau
 - paid_gmau
 - smau
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
index fbce567f29903..7c7cffaaf4abc 100644
--- a/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
+++ b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /admin/usage_trends by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_analytics_instance_statistics
+  - i_analytics_instance_statistics
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
index d35ea4076d783..ca278d7a030f1 100644
--- a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
@@ -5,7 +5,7 @@ description: The number of unique users who visited any analytics feature by wee
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,25 +13,26 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - users_viewing_analytics_group_devops_adoption
-    - i_analytics_dev_ops_adoption
-    - i_analytics_dev_ops_score
-    - p_analytics_merge_request
-    - i_analytics_instance_statistics
-    - g_analytics_contribution
-    - g_analytics_insights
-    - g_analytics_issues
-    - g_analytics_productivity
-    - g_analytics_valuestream
-    - p_analytics_pipelines
-    - p_analytics_code_reviews
-    - p_analytics_valuestream
-    - p_analytics_insights
-    - p_analytics_issues
-    - p_analytics_repo
-    - i_analytics_cohorts
+  - users_viewing_analytics_group_devops_adoption
+  - i_analytics_dev_ops_adoption
+  - i_analytics_dev_ops_score
+  - p_analytics_merge_request
+  - i_analytics_instance_statistics
+  - g_analytics_contribution
+  - g_analytics_insights
+  - g_analytics_issues
+  - g_analytics_productivity
+  - g_analytics_valuestream
+  - p_analytics_pipelines
+  - p_analytics_code_reviews
+  - p_analytics_valuestream
+  - p_analytics_insights
+  - p_analytics_issues
+  - p_analytics_repo
+  - i_analytics_cohorts
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
index 004b24b0d0e0a..1647550a10050 100644
--- a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
index e712a02c27d18..c4be5fac401ba 100644
--- a/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
+++ b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
index 7c27eff7b7595..ed72cf704786a 100644
--- a/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_mr_diffs
+  - i_code_review_mr_diffs
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
index 8430bb9c1adef..a9549fbeadd1b 100644
--- a/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_single_file_diffs
+  - i_code_review_user_single_file_diffs
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
index c6d312cac70da..ae3b66c096272 100644
--- a/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_mr_single_file_diffs
+  - i_code_review_mr_single_file_diffs
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
index 92a7035b685e7..ac6039cd971b6 100644
--- a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_mr
+  - i_code_review_user_create_mr
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
index c336a950746f3..5245cd4995085 100644
--- a/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_close_mr
+  - i_code_review_user_close_mr
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
index c4e59d2dcdbe9..984385a2b9a2f 100644
--- a/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_reopen_mr
+  - i_code_review_user_reopen_mr
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
index 635681cc47c2c..f47a9c490bff0 100644
--- a/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_merge_mr
+  - i_code_review_user_merge_mr
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
index 064367405c8b5..96b77fd1b8be8 100644
--- a/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
@@ -13,11 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_mr_comment
-instrumentation_class: RedisHLLMetric
-options:
-  events:
-    - i_code_review_user_create_mr
+  - i_code_review_user_create_mr
 distribution:
 - ce
 - ee
@@ -26,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
index 783c456c379f9..b07f7072363f8 100644
--- a/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_edit_mr_comment
+  - i_code_review_user_edit_mr_comment
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
index 8e0dc5b31a60a..2d43720e07e71 100644
--- a/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_remove_mr_comment
+  - i_code_review_user_remove_mr_comment
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml b/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
index 57fd33f2e2219..206a17e1444e3 100644
--- a/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
+++ b/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_add_suggestion
+  - i_code_review_user_add_suggestion
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml b/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
index 4e34212e9cbe2..0769a04074103 100644
--- a/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
+++ b/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_apply_suggestion
+  - i_code_review_user_apply_suggestion
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
index 90840faf43d24..abeb4443096b2 100644
--- a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
index 0e7720ee8b31a..fa18652e01eff 100644
--- a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
+++ b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
index 3bd141fbfcc0d..b3e2a500d1ff2 100644
--- a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
index 6b5b8d8914e4d..9e4c633950ab8 100644
--- a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
@@ -25,3 +25,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
index e7146cf81580e..ae8011b12852f 100644
--- a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
+++ b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
index c27b8be56ee6c..c34da9c09d620 100644
--- a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
@@ -24,3 +24,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
index 628956629fc1a..aedf400c95c5d 100644
--- a/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
index bfdc0410d2b55..612d563652929 100644
--- a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml b/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
index 903a1da1f1f67..791cf955e625b 100644
--- a/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users changing alert's status per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml b/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
index 98546cb7a8414..56cdf24222291 100644
--- a/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users assigning an alert per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml b/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
index 25c54267179ff..831e40774dfc9 100644
--- a/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding alerts to the TODO list per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml b/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
index 79abe8e945951..5e188ec023983 100644
--- a/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users creating incidents  per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml b/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
index 718faa29b4af1..c9722dc0061b0 100644
--- a/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users reopening incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml b/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
index e04baa14a93e9..51bfdf4a582eb 100644
--- a/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
@@ -5,7 +5,7 @@ description: Count of users closing incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml b/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
index 4791905293787..046537ccbbd0e 100644
--- a/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users assiging incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml b/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
index 6bb7e389b864b..9cd0d7a589c35 100644
--- a/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding incidents to the TODO list per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml b/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
index cfc02a494fd32..50879658e0959 100644
--- a/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding comments on incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml b/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
index 9e3f16ea2dbce..777c1e9ff5a90 100644
--- a/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
+++ b/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users creating Zoom meetings about incidents per we
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml b/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
index 8b4e93fe93843..fb74b260b9171 100644
--- a/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_relate_weekly
-description: Count of unique users adding issues per that are related to an incident week
+description: Count of unique users adding issues per that are related to an incident
+  week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml b/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
index dab3f0a561114..2550a0ac39c77 100644
--- a/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
+++ b/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_unrelate_weekly
-description: Count of unique users removing issue that are related to an incident per week
+description: Count of unique users removing issue that are related to an incident
+  per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml b/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
index 5ef90c0269a06..46450fbb24fe8 100644
--- a/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users changing incidents to confidential per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
index f8b657e27b7d4..7699dc412a8ff 100644
--- a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users performing events related to the incident man
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -35,3 +35,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml b/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
index fc6dbd18b32e6..97c755b084d41 100644
--- a/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
+++ b/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
@@ -23,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
index 67721c0f0818e..7792296ede1ac 100644
--- a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
index 3b24f3d43ee50..9b7b0aff5aaaf 100644
--- a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
index a1d3ebb27709b..9546d229dc51a 100644
--- a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
index eda1f51f2a164..cca084385eb53 100644
--- a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
+++ b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
index 8c4037fd1db28..314f68e1ffd6e 100644
--- a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
index 41dca2aac8dba..9a213878ac424 100644
--- a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
index 5ceedd15a2faa..82bade1fedb3e 100644
--- a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
index 8df9757fc1edc..507bbe001fb0b 100644
--- a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
index 6ce7c5fa822cf..eeedf266af446 100644
--- a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
index 0cd55b58aa0fc..eaf3330514c6b 100644
--- a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
+++ b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
index 5ce80d42f335d..67e067e743d34 100644
--- a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
+++ b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
index 7291567e17f93..2f35258190561 100644
--- a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
+++ b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
index b7abc40eb9f42..fa3532ffffc08 100644
--- a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
+++ b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
index c661beb585fd3..ee5b10f73da34 100644
--- a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
index 99cfc654a6372..a2a7fa469d8aa 100644
--- a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
index 17754a930fb2d..da6c077355c5e 100644
--- a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
index 2bc0b0014820d..f1e65fca1f347 100644
--- a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
index 162e8e91c7bcd..80de76e2ef415 100644
--- a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
+++ b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
index 829f76100019c..b52d274706000 100644
--- a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
index b5fa673f35a27..126b74499e411 100644
--- a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
index e855dec21e88e..f0559566c4d3d 100644
--- a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
index e7d071731db25..ad6316b484e0e 100644
--- a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
index 76d6004087911..53213c0aee056 100644
--- a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
index d0c8fd5c86318..7e53b2658df3a 100644
--- a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
index 8dace3f5ed453..996ed40d47433 100644
--- a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
index 3a5a3b6c3b634..bf95aab5c2270 100644
--- a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
+++ b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
index 6e016fabbba7a..012e8cd736457 100644
--- a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
@@ -54,3 +54,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 0ed6dc80f0b0c..1f915d188407a 100644
--- a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
+++ b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
@@ -13,11 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_approve
-instrumentation_class: RedisHLLMetric
-options:
-  events:
-    - i_quickactions_approve
+  - i_quickactions_approve
 distribution:
 - ce
 - ee
@@ -25,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
index a7a3ec1ad9566..ed1ac1fc5a01a 100644
--- a/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
+++ b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_single_weekly
-description: Count of WAU using the `/assign @user1` quick action to assign a single individual to an issuable 
+description: Count of WAU using the `/assign @user1` quick action to assign a single
+  individual to an issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,12 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_assign_single
+  - i_quickactions_assign_single
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
index a5115aff30f7b..e336ccd48456d 100644
--- a/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
+++ b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_self_weekly
-description: Count of WAU using the `/assign me` quick action to assign self to an issuable 
+description: Count of WAU using the `/assign me` quick action to assign self to an
+  issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_assign_self
+  - i_quickactions_assign_self
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate
\ No newline at end of file
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
index c38a8df55d848..d17f01ba74d76 100644
--- a/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_reviewer_weekly
-description: Count of WAU using the `/assign_reviewer` or `request_reviewer` quick action
+description: Count of WAU using the `/assign_reviewer` or `request_reviewer` quick
+  action
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -13,12 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_assign_reviewer
+  - i_quickactions_assign_reviewer
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
index 38bf53b85c709..bbf92d1573211 100644
--- a/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
+++ b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_award_weekly
-description: Count of WAU using the `/award` quick action to set an award emoji on an issuable 
+description: Count of WAU using the `/award` quick action to set an award emoji on
+  an issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,12 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_award
+  - i_quickactions_award
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
index 8f250a3f9d604..58cdfb3d26bfa 100644
--- a/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_board_move
+  - i_quickactions_board_move
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
index 4c7e9a6564086..33017355699cd 100644
--- a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_clone
+  - i_quickactions_clone
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
index 0abd261a955f0..1a79c56d6e8d1 100644
--- a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
+++ b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_close
+  - i_quickactions_close
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
index 923c8acdb3885..e45ac09271940 100644
--- a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_confidential_weekly
-description: Count of WAU using the `/confidential` quick action to set an issue as confidential
+description: Count of WAU using the `/confidential` quick action to set an issue as
+  confidential
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_confidential
+  - i_quickactions_confidential
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml b/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
index 38ed29c54d085..8ec03c43d6b76 100644
--- a/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_copy_metadata_merge_request
+  - i_quickactions_copy_metadata_merge_request
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
index 2358d4409b930..3e1767854c97e 100644
--- a/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU using the `/copy_metadata` quick action on an issue
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_copy_metadata_issue
+  - i_quickactions_copy_metadata_issue
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
index 35eecec2be21c..e030179038c07 100644
--- a/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_create_merge_request_weekly
-description: Count of WAU using the `/create_merge_request` quick action 
+description: Count of WAU using the `/create_merge_request` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_create_merge_request
+  - i_quickactions_create_merge_request
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
index 575992ebb5642..96ae0f4bdded1 100644
--- a/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
+++ b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_done
+  - i_quickactions_done
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
index dff8845d13ea9..6a94f46055c43 100644
--- a/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_draft_weekly
 description: Count of WAU using the `/draft` quick action on a Merge Request
 product_section: dev
 product_stage: create
-product_group: group::source code 
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_draft
+  - i_quickactions_draft
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
index 269b20a85f48f..ad8ecd954cb1d 100644
--- a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
+++ b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_due_weekly
-description: Count of WAU using the `/due` quick action to change the due date on an issuable 
+description: Count of WAU using the `/due` quick action to change the due date on
+  an issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,12 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_due
+  - i_quickactions_due
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
index 0b4d121e7f124..b19f6c4e9c5d4 100644
--- a/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_duplicate_weekly
-description: Count of WAU using the `/duplicate` quick action to mark an issue as a duplicate of another
+description: Count of WAU using the `/duplicate` quick action to mark an issue as
+  a duplicate of another
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_duplicate
+  - i_quickactions_duplicate
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
index 7a48efa232fa1..c2b1deca9754d 100644
--- a/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_estimate_weekly
-description: Count of WAU using the `/estimate` quick action to set a time estimate on an issue
+description: Count of WAU using the `/estimate` quick action to set a time estimate
+  on an issue
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: time_tracking 
+product_category: time_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_estimate
+  - i_quickactions_estimate
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate
\ No newline at end of file
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
index 0106fe73fb722..33928740ec4e9 100644
--- a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
+++ b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU using the `/label` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_label
+  - i_quickactions_label
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
index 05baed7408364..8413b19c2eca8 100644
--- a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_lock_weekly
-description: Count of WAU using the `/lock` quick action 
+description: Count of WAU using the `/lock` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_lock
+  - i_quickactions_lock
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate
\ No newline at end of file
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
index 4f71a2b34a210..df13bddbd8e03 100644
--- a/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
+++ b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_merge_weekly
 description: Count of WAU using the `/merge` quick action
 product_section: dev
 product_stage: create
-product_group: group::source code 
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_merge
+  - i_quickactions_merge
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
index 070b1a8fcead3..0137107ab43d3 100644
--- a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_milestone_weekly
-description: Count of WAU using the `/milestone` quick action 
-product_section: dev 
+description: Count of WAU using the `/milestone` quick action
+product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_milestone
+  - i_quickactions_milestone
 distribution:
 - ce
 - ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
index 2523ac9d6bc86..810818ffc702f 100644
--- a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_move
+  - i_quickactions_move
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
index abc657df3c24e..a80048aed6219 100644
--- a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
+++ b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU using the `/reassign @user1` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_reassign
+  - i_quickactions_reassign
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
index 951e97973cf17..7e09271ddf3de 100644
--- a/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_reassign_reviewer
+  - i_quickactions_reassign_reviewer
 distribution:
 - ce
 - ee
@@ -21,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
index d43e975f9000b..bf596027a02da 100644
--- a/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
+++ b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_rebase_weekly
 description: Count of WAU using the `/rebase` quick action on a Merge Request
 product_section: dev
-product_stage: source_code 
-product_group: group::source code 
+product_stage: source_code
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_rebase
+  - i_quickactions_rebase
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
index cd0ef13cf14d0..de85db7cb392e 100644
--- a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
+++ b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU using the `/relabel` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_relabel
+  - i_quickactions_relabel
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
index f6076e328a8c0..e80b23ea8debe 100644
--- a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU using the `/relate` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_relate
+  - i_quickactions_relate
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
index 2111cb5f388f3..59b7e03fa1337 100644
--- a/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
+++ b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU using the `/remove_due_date` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_due_date
+  - i_quickactions_remove_due_date
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
index 69035a5cd2f6b..8d9f7b59755d4 100644
--- a/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_estimate_weekly
-description: Count of WAU using the `/remove_estimate` quick action 
+description: Count of WAU using the `/remove_estimate` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: time_tracking 
+product_category: time_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_estimate
+  - i_quickactions_remove_estimate
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate
\ No newline at end of file
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
index 4dffc94c7824f..5ffdd8b8975a4 100644
--- a/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_milestone_weekly
-description: Count of WAU using the `/remove_milestone` quick action 
+description: Count of WAU using the `/remove_milestone` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_milestone
+  - i_quickactions_remove_milestone
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
index 83ade2edb86b6..d821277977532 100644
--- a/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
+++ b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_time_spent
+  - i_quickactions_remove_time_spent
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
index bd3beb71a6354..a2b3f2f86fa5a 100644
--- a/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_zoom_weekly
-description: Count of WAU using the `/remove_zoom` quick action 
+description: Count of WAU using the `/remove_zoom` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_zoom
+  - i_quickactions_remove_zoom
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate 
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
index 4b861cf276773..8c1d5bfa60086 100644
--- a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
+++ b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_reopen_weekly
-description: Count of WAU using the `/reopen` quick action 
+description: Count of WAU using the `/reopen` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_reopen
+  - i_quickactions_reopen
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
index b9f858890dac6..c7883a9ea2e2e 100644
--- a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
+++ b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_shrug_weekly
-description: Count of WAU using the `/shrug` quick action 
+description: Count of WAU using the `/shrug` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_shrug
+  - i_quickactions_shrug
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
index 95ca954f42588..bff255cb01762 100644
--- a/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
+++ b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_subtract_weekly
-description: Count of WAU using the `/spend` quick action to subtract time spent 
+description: Count of WAU using the `/spend` quick action to subtract time spent
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: time_tracking 
+product_category: time_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_spend_subtract
+  - i_quickactions_spend_subtract
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
index 5b96c328208a7..92f73c81547b5 100644
--- a/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
+++ b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_add_weekly
-description: Count of WAU using the `/spend` quick action to add time spent 
+description: Count of WAU using the `/spend` quick action to add time spent
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_spend_add
+  - i_quickactions_spend_add
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml b/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
index 61738f625060c..55f71f96d0062 100644
--- a/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
+++ b/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_submit_review
+  - i_quickactions_submit_review
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate 
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
index 819b314862d7b..4e9a79304aef8 100644
--- a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_subscribe_weekly
-description: Count of WAU using the `/subscribe` quick action 
+description: Count of WAU using the `/subscribe` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_subscribe
+  - i_quickactions_subscribe
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
index 490dd5f3dce6e..ad11e7956b34f 100644
--- a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_tableflip_weekly
-description: Count of WAU using the `/tableflip` quick action 
+description: Count of WAU using the `/tableflip` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_tableflip
+  - i_quickactions_tableflip
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
index 52ffe59604e71..4b5c11b0c72f3 100644
--- a/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
+++ b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_tag_weekly
-description: Count of WAU using the `/tag` quick action 
+description: Count of WAU using the `/tag` quick action
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_tag
+  - i_quickactions_tag
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml b/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
index 8a7a20e016880..de097f7d2f9d6 100644
--- a/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
+++ b/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_target_branch_weekly
 description: Count of WAU using the `/target_branch` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::source code 
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_target_branch
+  - i_quickactions_target_branch
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate
\ No newline at end of file
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
index 5d390130bcf73..775a8ee2d0211 100644
--- a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_title_weekly
-description: Count of WAU using the `/title` quick action 
+description: Count of WAU using the `/title` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_title
+  - i_quickactions_title
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
index 62c2ecadc3912..7116cf18e89c7 100644
--- a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_todo_weekly
-description: Count of WAU using the `/todo` quick action 
+description: Count of WAU using the `/todo` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_todo
+  - i_quickactions_todo
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml b/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
index a3bed5449c9e0..8eccbb4b8238f 100644
--- a/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
+++ b/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unassign_specific
+  - i_quickactions_unassign_specific
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml b/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
index 41b6b77e73b25..5d63011692c72 100644
--- a/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
+++ b/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unassign_all
+  - i_quickactions_unassign_all
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate
\ No newline at end of file
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
index ffcd580673e7c..b40e84af96990 100644
--- a/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
@@ -1,10 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unassign_reviewer_weekly
-description: Count of WAU using the `/unassign_reviewer` or `/remove_reviewer` quick action on Merge Requests
+description: Count of WAU using the `/unassign_reviewer` or `/remove_reviewer` quick
+  action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::code review 
+product_group: group::code review
 product_category: code_review
 value_type: number
 status: data_available
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unassign_reviewer
+  - i_quickactions_unassign_reviewer
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
index 5ce812bd6ecbd..bc6869715d3cc 100644
--- a/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
+++ b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_specific_weekly
-description: Count of WAU using the `/unlabel` or `/remove_label` quick action to remove one or more specific labels
+description: Count of WAU using the `/unlabel` or `/remove_label` quick action to
+  remove one or more specific labels
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unlabel_specific
+  - i_quickactions_unlabel_specific
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
index b78f9ca8ef9c3..bda75ebe100fe 100644
--- a/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
+++ b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unlabel_all
+  - i_quickactions_unlabel_all
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
index 57b310903f36a..7a25822cbc1ca 100644
--- a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unlock
+  - i_quickactions_unlock
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
index a105958e4a1f7..8c0e0cb8d8006 100644
--- a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unsubscribe
+  - i_quickactions_unsubscribe
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
index 25e8f4be9ea2d..bbfba240a9e42 100644
--- a/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_wip_weekly
 description: Count of WAU using the `/wip` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::source code 
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_wip
+  - i_quickactions_wip
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
index 5a39c45b49bcf..3955f88e9b8c3 100644
--- a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_zoom_weekly
-description: Count of WAU using the `/zoom` quick action on Issues 
+description: Count of WAU using the `/zoom` quick action on Issues
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_zoom
+  - i_quickactions_zoom
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate
\ No newline at end of file
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
index e82cd9f475bec..3f0da3b37b47f 100644
--- a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
index 476ec4048223e..f2431232de704 100644
--- a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
index db7052b12ef56..f8156a1d8933f 100644
--- a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.source_code.project_action_weekly
-description: Count of unique actions done on projects and related resources (create, edit, delete, comment)
+description: Count of unique actions done on projects and related resources (create,
+  edit, delete, comment)
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
index d03fd57da15e3..99ffc84ebefb1 100644
--- a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
+++ b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
@@ -23,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
index abde6514c0d7d..f9e751ba88f25 100644
--- a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
+++ b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
index 3e2c55c64a532..7942c3827e23b 100644
--- a/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
index ad3c78880b67b..7464bb5363a5e 100644
--- a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
+++ b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_snippets_show
+  - i_snippets_show
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml b/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
index 34c7a54c61a1a..7384cb6f3d0d5 100644
--- a/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
+++ b/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - o_pipeline_authoring_unique_users_committing_ciconfigfile
+  - o_pipeline_authoring_unique_users_committing_ciconfigfile
 distribution:
 - ee
 - ce
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
index 8d67335f0d2b8..ace60e321d0d0 100644
--- a/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
+++ b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_toggled_task_item_status
+  - i_code_review_user_toggled_task_item_status
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
index 14eb2ace2fb24..627bd8b1c4305 100644
--- a/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_approve_mr
+  - i_code_review_user_approve_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
index ba26fdb3d6f76..927cfaa6455a7 100644
--- a/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_unapprove_mr
+  - i_code_review_user_unapprove_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
index 7aed369c9b023..a11d060c9ebad 100644
--- a/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
+++ b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_resolve_thread
+  - i_code_review_user_resolve_thread
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
index 77e7b6a2ffd65..da806241cf230 100644
--- a/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
+++ b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_unresolve_thread
+  - i_code_review_user_unresolve_thread
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
index 2676804eab835..4fcbf64ca4017 100644
--- a/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_edit_mr_title
+  - i_code_review_edit_mr_title
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
index 7195b41324ce8..d60e13e81e42c 100644
--- a/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
+++ b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_edit_mr_desc
+  - i_code_review_edit_mr_desc
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
index 0f1b9370ac895..37a0c331d7d1b 100644
--- a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
+++ b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_review_note_weekly
-description: Count of unique users per week who create a note as part of a merge request review
+description: Count of unique users per week who create a note as part of a merge request
+  review
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_review_note
+  - i_code_review_user_create_review_note
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
index 2228aacdfac6b..aea4044fb8e4c 100644
--- a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
+++ b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_publish_review_weekly
-description: Count of unique users per week who publish their review as part of a merge request review
+description: Count of unique users per week who publish their review as part of a
+  merge request review
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_publish_review
+  - i_code_review_user_publish_review
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
index 5874320eaa685..501f9312a890b 100644
--- a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_multiline_mr_comment_weekly
-description: Count of unique users per week who create a multiline comment in a merge request
+description: Count of unique users per week who create a multiline comment in a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_multiline_mr_comment
+  - i_code_review_user_create_multiline_mr_comment
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
index 77da5c512dd87..28f343965f4a6 100644
--- a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_edit_multiline_mr_comment_weekly
-description: Count of unique users per week who edit a multiline comment in a merge request
+description: Count of unique users per week who edit a multiline comment in a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_edit_multiline_mr_comment
+  - i_code_review_user_edit_multiline_mr_comment
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
index a84bf25dc3b17..4e288fb498551 100644
--- a/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_remove_multiline_mr_comment_weekly
-description: Count of unique users per week who remove a multiline comment in a merge request
+description: Count of unique users per week who remove a multiline comment in a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_remove_multiline_mr_comment
+  - i_code_review_user_remove_multiline_mr_comment
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
index 8dcb7355259cd..f7ec20756786b 100644
--- a/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_assigned
+  - i_code_review_user_assigned
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
index d629ff47e6acf..dd37cefc18d6d 100644
--- a/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_marked_as_draft
+  - i_code_review_user_marked_as_draft
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
index a9ca86c9c8911..eb7abf2d1b7da 100644
--- a/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_unmarked_as_draft
+  - i_code_review_user_unmarked_as_draft
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
index 1f048cc0ab557..d0423ec2cb02c 100644
--- a/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
+++ b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_review_requested
+  - i_code_review_user_review_requested
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
index 3880ed061b031..eecd6f8a8bffe 100644
--- a/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_approval_rule_added
+  - i_code_review_user_approval_rule_added
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
index d11f0e03d5765..9e103b54f2ca5 100644
--- a/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
+++ b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_deleted_weekly
-description: Count of unique users per week who delete an approval rule to a merge request
+description: Count of unique users per week who delete an approval rule to a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_approval_rule_deleted
+  - i_code_review_user_approval_rule_deleted
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
index f07a6b8084fb7..7c07dc5aa9bc0 100644
--- a/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_approval_rule_edited
+  - i_code_review_user_approval_rule_edited
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
index a583b1a1ad7e8..9c4f70f94ff4d 100644
--- a/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_vs_code_api_request
+  - i_code_review_user_vs_code_api_request
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
index 3147fe6d7a694..ff94cbe89e7c9 100644
--- a/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_mr_from_issue
+  - i_code_review_user_create_mr_from_issue
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
index ddd40581db4d9..79d205695b557 100644
--- a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
@@ -12,62 +12,62 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_mr_diffs
-    - i_code_review_user_single_file_diffs
-    - i_code_review_mr_single_file_diffs
-    - i_code_review_user_toggled_task_item_status
-    - i_code_review_user_create_mr
-    - i_code_review_user_close_mr
-    - i_code_review_user_reopen_mr
-    - i_code_review_user_approve_mr
-    - i_code_review_user_unapprove_mr
-    - i_code_review_user_resolve_thread
-    - i_code_review_user_unresolve_thread
-    - i_code_review_edit_mr_title
-    - i_code_review_edit_mr_desc
-    - i_code_review_user_merge_mr
-    - i_code_review_user_create_mr_comment
-    - i_code_review_user_edit_mr_comment
-    - i_code_review_user_remove_mr_comment
-    - i_code_review_user_create_review_note
-    - i_code_review_user_publish_review
-    - i_code_review_user_create_multiline_mr_comment
-    - i_code_review_user_edit_multiline_mr_comment
-    - i_code_review_user_remove_multiline_mr_comment
-    - i_code_review_user_add_suggestion
-    - i_code_review_user_apply_suggestion
-    - i_code_review_user_assigned
-    - i_code_review_user_marked_as_draft
-    - i_code_review_user_unmarked_as_draft
-    - i_code_review_user_review_requested
-    - i_code_review_user_approval_rule_added
-    - i_code_review_user_approval_rule_deleted
-    - i_code_review_user_approval_rule_edited
-    - i_code_review_user_vs_code_api_request
-    - i_code_review_user_create_mr_from_issue
-    - i_code_review_user_mr_discussion_locked
-    - i_code_review_user_mr_discussion_unlocked
-    - i_code_review_user_time_estimate_changed
-    - i_code_review_user_time_spent_changed
-    - i_code_review_user_assignees_changed
-    - 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
-    - i_code_review_diff_view_inline
-    - i_code_review_diff_view_parallel
-    - i_code_review_file_browser_tree_view
-    - i_code_review_file_browser_list_view
-    - i_code_review_diff_show_whitespace
-    - 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
-    - i_code_review_user_searches_diff
+  - i_code_review_mr_diffs
+  - i_code_review_user_single_file_diffs
+  - i_code_review_mr_single_file_diffs
+  - i_code_review_user_toggled_task_item_status
+  - i_code_review_user_create_mr
+  - i_code_review_user_close_mr
+  - i_code_review_user_reopen_mr
+  - i_code_review_user_approve_mr
+  - i_code_review_user_unapprove_mr
+  - i_code_review_user_resolve_thread
+  - i_code_review_user_unresolve_thread
+  - i_code_review_edit_mr_title
+  - i_code_review_edit_mr_desc
+  - i_code_review_user_merge_mr
+  - i_code_review_user_create_mr_comment
+  - i_code_review_user_edit_mr_comment
+  - i_code_review_user_remove_mr_comment
+  - i_code_review_user_create_review_note
+  - i_code_review_user_publish_review
+  - i_code_review_user_create_multiline_mr_comment
+  - i_code_review_user_edit_multiline_mr_comment
+  - i_code_review_user_remove_multiline_mr_comment
+  - i_code_review_user_add_suggestion
+  - i_code_review_user_apply_suggestion
+  - i_code_review_user_assigned
+  - i_code_review_user_marked_as_draft
+  - i_code_review_user_unmarked_as_draft
+  - i_code_review_user_review_requested
+  - i_code_review_user_approval_rule_added
+  - i_code_review_user_approval_rule_deleted
+  - i_code_review_user_approval_rule_edited
+  - i_code_review_user_vs_code_api_request
+  - i_code_review_user_create_mr_from_issue
+  - i_code_review_user_mr_discussion_locked
+  - i_code_review_user_mr_discussion_unlocked
+  - i_code_review_user_time_estimate_changed
+  - i_code_review_user_time_spent_changed
+  - i_code_review_user_assignees_changed
+  - 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
+  - i_code_review_diff_view_inline
+  - i_code_review_diff_view_parallel
+  - i_code_review_file_browser_tree_view
+  - i_code_review_file_browser_list_view
+  - i_code_review_diff_show_whitespace
+  - 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
+  - i_code_review_user_searches_diff
 distribution:
 - ce
 - ee
@@ -76,3 +76,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
index 01155a1c0e070..54aa24ca54892 100644
--- a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
+++ b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_we
 description: Number of projects using 5 min production app CI template in last 7 days.
 product_section: seg
 product_stage: deploy
-product_group: "group::5-min-app"
+product_group: group::5-min-app
 product_category: five_minute_production_app
 value_type: number
 status: data_available
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_5_min_production_app
+  - p_ci_templates_5_min_production_app
 distribution:
 - ce
 - ee
@@ -21,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
index 822006bc84d23..de19f9d176cc0 100644
--- a/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
@@ -1,10 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_cf_deploy_ec2_weekly
-description: "Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.yml` template in last 7 days."
+description: Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.yml`
+  template in last 7 days.
 product_section: ops
 product_stage: release
-product_group: "group::release"
+product_group: group::release
 product_category: continuous_delivery
 value_type: number
 status: data_available
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_aws_cf_deploy_ec2
+  - p_ci_templates_aws_cf_deploy_ec2
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
index 5c027842d6398..ac3725c642515 100644
--- a/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
@@ -1,10 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_deploy_ecs_weekly
-description: "Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in last 7 days."
+description: Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in last
+  7 days.
 product_section: ops
 product_stage: release
-product_group: "group::release"
+product_group: group::release
 product_category: continuous_delivery
 value_type: number
 status: data_available
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_aws_deploy_ecs
+  - p_ci_templates_aws_deploy_ecs
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
index 9edb43b3aee34..19fc88278d209 100644
--- 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
@@ -14,21 +14,21 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_auto_devops
-    - p_ci_templates_implicit_auto_devops_build
-    - p_ci_templates_implicit_auto_devops_deploy
-    - p_ci_templates_implicit_security_sast
-    - p_ci_templates_implicit_security_secret_detection
-    - p_ci_templates_5_min_production_app
-    - p_ci_templates_auto_devops
-    - p_ci_templates_aws_cf_deploy_ec2
-    - p_ci_templates_aws_deploy_ecs
-    - p_ci_templates_auto_devops_build
-    - p_ci_templates_auto_devops_deploy
-    - p_ci_templates_auto_devops_deploy_latest
-    - p_ci_templates_security_sast
-    - p_ci_templates_security_secret_detection
-    - p_ci_templates_terraform_base_latest
+  - p_ci_templates_implicit_auto_devops
+  - p_ci_templates_implicit_auto_devops_build
+  - p_ci_templates_implicit_auto_devops_deploy
+  - p_ci_templates_implicit_security_sast
+  - p_ci_templates_implicit_security_secret_detection
+  - p_ci_templates_5_min_production_app
+  - p_ci_templates_auto_devops
+  - p_ci_templates_aws_cf_deploy_ec2
+  - p_ci_templates_aws_deploy_ecs
+  - p_ci_templates_auto_devops_build
+  - p_ci_templates_auto_devops_deploy
+  - p_ci_templates_auto_devops_deploy_latest
+  - p_ci_templates_security_sast
+  - p_ci_templates_security_secret_detection
+  - p_ci_templates_terraform_base_latest
 distribution:
 - ce
 - ee
@@ -37,3 +37,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
index 7d918a5a496ad..627138b5082ed 100644
--- a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_composer_deploy_token
+  - i_package_composer_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
index 13e5875fc4979..b4935dfe4741e 100644
--- a/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_conan_deploy_token
+  - i_package_conan_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
index 1b930e244eda4..9fc146d3c8616 100644
--- a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_container_deploy_token
+  - i_package_container_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
index daf1268d0215e..40b86d27bcaeb 100644
--- a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_debian_deploy_token
+  - i_package_debian_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
index 82900f13262e7..ffee733e5b8f9 100644
--- a/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_generic_deploy_token
+  - i_package_generic_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
index 73993965b140c..59b1aef3cb6b5 100644
--- a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_golang_deploy_token
+  - i_package_golang_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
index 33ccf6b94c246..496c431a57f05 100644
--- a/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_maven_deploy_token
+  - i_package_maven_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
index 295258be202c4..8f3f42d6de957 100644
--- a/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_npm_deploy_token
+  - i_package_npm_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
index 849f1541c7862..9538977994841 100644
--- a/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_nuget_deploy_token
+  - i_package_nuget_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
index 4e74098a20c71..b949da1246bb8 100644
--- a/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_pypi_deploy_token
+  - i_package_pypi_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
index 35cb4ed18cd37..e28f423b10853 100644
--- a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_tag_deploy_token
+  - i_package_tag_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
index 584e56510e96f..2f7b4bbcd5644 100644
--- a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
@@ -13,20 +13,20 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_composer_deploy_token
-    - i_package_conan_deploy_token
-    - i_package_container_deploy_token
-    - i_package_debian_deploy_token
-    - i_package_generic_deploy_token
-    - i_package_golang_deploy_token
-    - i_package_helm_deploy_token
-    - i_package_maven_deploy_token
-    - i_package_npm_deploy_token
-    - i_package_nuget_deploy_token
-    - i_package_pypi_deploy_token
-    - i_package_rubygems_deploy_token
-    - i_package_tag_deploy_token
-    - i_package_terraform_module_deploy_token
+  - i_package_composer_deploy_token
+  - i_package_conan_deploy_token
+  - i_package_container_deploy_token
+  - i_package_debian_deploy_token
+  - i_package_generic_deploy_token
+  - i_package_golang_deploy_token
+  - i_package_helm_deploy_token
+  - i_package_maven_deploy_token
+  - i_package_npm_deploy_token
+  - i_package_nuget_deploy_token
+  - i_package_pypi_deploy_token
+  - i_package_rubygems_deploy_token
+  - i_package_tag_deploy_token
+  - i_package_terraform_module_deploy_token
 distribution:
 - ee
 - ce
@@ -35,3 +35,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
index 09514b747fabb..4f3e5272af009 100644
--- a/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_composer_user
+  - i_package_composer_user
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
index 6038b6a7460d1..1a9376cda8047 100644
--- a/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_conan_user
+  - i_package_conan_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
index 795982a8c63c9..313b9b9a68e5a 100644
--- a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_container_user
+  - i_package_container_user
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
index 9cc704c46fd77..2d61d3fa9924c 100644
--- a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_debian_user
+  - i_package_debian_user
 distribution:
 - ee
 - ce
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
index 8e8198a5fcd85..63278bcfbd82d 100644
--- a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
+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
@@ -14,7 +15,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_generic_user
+  - i_package_generic_user
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
index f331fccc17829..1ccd4d89b5baf 100644
--- a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_golang_user
+  - i_package_golang_user
 distribution:
 - ee
 - ce
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
index a79ce0401c5d0..2d2e9b135d335 100644
--- a/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_maven_user
+  - i_package_maven_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
index 5eb7c85ad1bd7..e0ceebc835f18 100644
--- a/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_npm_user
+  - i_package_npm_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
index e8ead65cf925b..f71ac914e7fb5 100644
--- a/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_nuget_user
+  - i_package_nuget_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
index 19d099eb67783..9a0e63ec18373 100644
--- a/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_pypi_user
+  - i_package_pypi_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
index aa65fc12daafa..5169e2d55195f 100644
--- a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
+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
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_tag_user
+  - i_package_tag_user
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
index d7e35fb52eb7d..8d2dbc3e4f8f3 100644
--- a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
@@ -13,20 +13,20 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_composer_user
-    - i_package_conan_user
-    - i_package_container_user
-    - i_package_debian_user
-    - i_package_generic_user
-    - i_package_golang_user
-    - i_package_helm_user
-    - i_package_maven_user
-    - i_package_npm_user
-    - i_package_nuget_user
-    - i_package_pypi_user
-    - i_package_rubygems_user
-    - i_package_tag_user
-    - i_package_terraform_module_user
+  - i_package_composer_user
+  - i_package_conan_user
+  - i_package_container_user
+  - i_package_debian_user
+  - i_package_generic_user
+  - i_package_golang_user
+  - i_package_helm_user
+  - i_package_maven_user
+  - i_package_npm_user
+  - i_package_nuget_user
+  - i_package_pypi_user
+  - i_package_rubygems_user
+  - i_package_tag_user
+  - i_package_terraform_module_user
 distribution:
 - ee
 - ce
@@ -35,3 +35,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
index 45b42df9a58b2..3d3d04efae2e4 100644
--- a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_close_issue
+  - i_ecosystem_jira_service_close_issue
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
index bcd142629ecd9..2c9de3b6509f5 100644
--- a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
+++ b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_cross_reference
+  - i_ecosystem_jira_service_cross_reference
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
index 109e4b0ac0af0..e5c32cb611a5d 100644
--- a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
@@ -13,19 +13,19 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_close_issue
-    - i_ecosystem_jira_service_cross_reference
-    - i_ecosystem_jira_service_list_issues
-    - i_ecosystem_jira_service_create_issue
-    - i_ecosystem_slack_service_issue_notification
-    - i_ecosystem_slack_service_push_notification
-    - i_ecosystem_slack_service_deployment_notification
-    - i_ecosystem_slack_service_wiki_page_notification
-    - i_ecosystem_slack_service_merge_request_notification
-    - i_ecosystem_slack_service_note_notification
-    - i_ecosystem_slack_service_tag_push_notification
-    - i_ecosystem_slack_service_confidential_note_notification
-    - i_ecosystem_slack_service_confidential_issue_notification
+  - i_ecosystem_jira_service_close_issue
+  - i_ecosystem_jira_service_cross_reference
+  - i_ecosystem_jira_service_list_issues
+  - i_ecosystem_jira_service_create_issue
+  - i_ecosystem_slack_service_issue_notification
+  - i_ecosystem_slack_service_push_notification
+  - i_ecosystem_slack_service_deployment_notification
+  - i_ecosystem_slack_service_wiki_page_notification
+  - i_ecosystem_slack_service_merge_request_notification
+  - i_ecosystem_slack_service_note_notification
+  - i_ecosystem_slack_service_tag_push_notification
+  - i_ecosystem_slack_service_confidential_note_notification
+  - i_ecosystem_slack_service_confidential_issue_notification
 distribution:
 - ce
 - ee
@@ -33,3 +33,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210204124930_servers.yml b/config/metrics/counts_all/20210204124930_servers.yml
index 8012b83b2518b..0bf9cc6438055 100644
--- a/config/metrics/counts_all/20210204124930_servers.yml
+++ b/config/metrics/counts_all/20210204124930_servers.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210204124932_clusters.yml b/config/metrics/counts_all/20210204124932_clusters.yml
index c5be4a912a679..27bdf43f1dcba 100644
--- a/config/metrics/counts_all/20210204124932_clusters.yml
+++ b/config/metrics/counts_all/20210204124932_clusters.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
index 03b58e61f7082..d214c23cd64b7 100644
--- a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
+++ b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
@@ -5,7 +5,7 @@ description: Total visits to VSA (both group- and project-level) all time
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml b/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
index c31b0a9d912ef..2d5e592a2dc4f 100644
--- a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
+++ b/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml b/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
index 8fb0041b290fa..0c4b928e93daf 100644
--- a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
+++ b/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml b/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
index f70c95b4b35e7..2c0d615183132 100644
--- a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
+++ b/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml b/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
index 7bd836eb477dd..8f61665820fbc 100644
--- a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
+++ b/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml b/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml
index 5d2413b929717..4171e8efa53e7 100644
--- a/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml
+++ b/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
index 3fdb40f32d93b..7ebea5bbbcc3b 100644
--- a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
+++ b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
@@ -9,10 +9,10 @@ product_category:
 value_type: number
 status: removed
 time_frame: 7d
-data_source: redis_hll
 data_source:
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
\ No newline at end of file
+skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml b/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
index dc5d05da04aad..1032204843c27 100644
--- a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
+++ b/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml b/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
index 551970130713d..587bd0acbff35 100644
--- a/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
+++ b/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
@@ -5,14 +5,15 @@ description: Unique visitors to any analytics feature by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
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 5f03db90f3bae..d81ede4064695 100644
--- a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
@@ -17,3 +17,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
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 74a39d81941e6..1f3a527f82682 100644
--- a/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
+++ b/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
@@ -17,3 +17,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
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 8cd2a5bd76178..98c5ae12ff5d1 100644
--- a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
@@ -16,3 +16,4 @@ distribution:
 tier:
 - free
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175026_service_desk_issues.yml b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
index 9e2dc5499b093..2b46e53b904cc 100644
--- a/config/metrics/counts_all/20210216175026_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
@@ -16,3 +16,4 @@ distribution:
 tier:
 - free
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175037_suggestions.yml b/config/metrics/counts_all/20210216175037_suggestions.yml
index 5cd566a31866a..b380c78158ea4 100644
--- a/config/metrics/counts_all/20210216175037_suggestions.yml
+++ b/config/metrics/counts_all/20210216175037_suggestions.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175039_merge_requests.yml b/config/metrics/counts_all/20210216175039_merge_requests.yml
index 1c9a1a0185c6f..64418431caef3 100644
--- a/config/metrics/counts_all/20210216175039_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175039_merge_requests.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175041_merge_request_comment.yml b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
index 0b3bce59176cf..dbc8995993be2 100644
--- a/config/metrics/counts_all/20210216175041_merge_request_comment.yml
+++ b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175043_merge_request_create.yml b/config/metrics/counts_all/20210216175043_merge_request_create.yml
index 13393b8c1b817..b3302b6bf7245 100644
--- a/config/metrics/counts_all/20210216175043_merge_request_create.yml
+++ b/config/metrics/counts_all/20210216175043_merge_request_create.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175045_merge_requests.yml b/config/metrics/counts_all/20210216175045_merge_requests.yml
index 088df8eca7cd6..b6211db1e5a6b 100644
--- a/config/metrics/counts_all/20210216175045_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175045_merge_requests.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175053_suggestions.yml b/config/metrics/counts_all/20210216175053_suggestions.yml
index f0361655616d3..cad2f44921eaf 100644
--- a/config/metrics/counts_all/20210216175053_suggestions.yml
+++ b/config/metrics/counts_all/20210216175053_suggestions.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml b/config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml
index b5facd08c21ff..7ab8415d5083c 100644
--- a/config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml
+++ b/config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
index be8c33d144dd6..35b296157938b 100644
--- a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
+++ b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.auto_devops_enabled
-description: Projects with Auto DevOps template enabled (excluding implicit Auto DevOps enabled and Auto DevOps template includes)
+description: Projects with Auto DevOps template enabled (excluding implicit Auto DevOps
+  enabled and Auto DevOps template includes)
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
index 69e9729d825a0..3bbb6f2ac39eb 100644
--- a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
+++ b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.auto_devops_disabled
 description: Projects with Auto DevOps template disabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: auto_devops
 value_type: number
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175232_clusters.yml b/config/metrics/counts_all/20210216175232_clusters.yml
index e6894699827e8..1446c477e1f70 100644
--- a/config/metrics/counts_all/20210216175232_clusters.yml
+++ b/config/metrics/counts_all/20210216175232_clusters.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters
 description: Total GitLab Managed clusters both enabled and disabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175234_clusters_enabled.yml b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
index 6b940dfb5b3a8..a553baa771786 100644
--- a/config/metrics/counts_all/20210216175234_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
index f0db7b473cf62..b1cafeff17215 100644
--- a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.project_clusters_enabled
 description: Total GitLab Managed clusters attached to projects
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
index 6765d24cea840..b9af222740c60 100644
--- a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.group_clusters_enabled
 description: Total GitLab Managed clusters attached to groups
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
index afa8a761cf1ab..5813fe5c994c4 100644
--- a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instance_clusters_enabled
 description: Total GitLab Managed clusters attached to the instance
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175242_clusters_disabled.yml b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
index 0fac20affd344..6cfb6ffe32e87 100644
--- a/config/metrics/counts_all/20210216175242_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
index 2b41f61041566..8eaa2c964975a 100644
--- a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.project_clusters_disabled
 description: Total GitLab Managed disabled clusters previously attached to projects
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
index b7a839f345af9..49a4d17b3f3e8 100644
--- a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.group_clusters_disabled
 description: Total GitLab Managed disabled clusters previously attached to groups
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
index 94b5d48dffa86..b7618704997f1 100644
--- a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instance_clusters_disabled
 description: Total GitLab Managed disabled clusters previously attached to the instance
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
index 1470dbe809fd5..f19489704b3eb 100644
--- a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_platforms_eks
 description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
index 6f1692cc2b6e5..97d82b92f2fef 100644
--- a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_platforms_gke
 description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
index eaeff4aa3a0b1..d0e67887ed460 100644
--- a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_platforms_user
 description: Total GitLab Managed clusters that are user provisioned
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
index bb85d43bc634d..2c7f5a86aa7d0 100644
--- a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_helm
 description: Total GitLab Managed clusters with GitLab Managed App:Helm enabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
index 87b412b45f6d5..1984d50f0e6be 100644
--- a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_ingress
 description: Total GitLab Managed clusters with GitLab Managed App:Ingress installed
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
index f93f0e73e9d34..d1dfad6027142 100644
--- a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_cert_managers
 description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager installed
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
index b365dabe4661f..02c0734bf83ee 100644
--- a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
+++ b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_crossplane
 description: Total GitLab Managed clusters with GitLab Managed App:Crossplane installed
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
index 7d86d5da125e9..5811faa0c5c7c 100644
--- a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_prometheus
 description: Total GitLab Managed clusters with GitLab Managed App:Prometheus installed
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
index d10f2bb240a0d..2a98d48cbca81 100644
--- a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
index a92b043622da9..04f2cfdcb5638 100644
--- a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_knative
 description: Total GitLab Managed clusters with GitLab Managed App:Knative installed
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
index 9f94bf9ff3039..11f23a62905cf 100644
--- a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
+++ b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_elastic_stack
 description: Total GitLab Managed clusters with GitLab Managed App:Elastic Stack installed
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
index 8501a763454ee..33f93fde68893 100644
--- a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
+++ b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_jupyter
 description: Total GitLab Managed clusters with GitLab Managed App:Jupyter installed
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
index f01577832356f..d7b2efab4c506 100644
--- a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
+++ b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
@@ -3,7 +3,7 @@ data_category: operational
 key_path: counts.clusters_applications_cilium
 description: Total GitLab Managed clusters with GitLab Managed App:Cilium installed
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175314_clusters_management_project.yml b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
index c6dbd9469c120..707d1a27c8957 100644
--- a/config/metrics/counts_all/20210216175314_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_management_project
 description: Total GitLab Managed clusters with defined cluster management project
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
index 9fc55da3b6434..5dcae874ea2a9 100644
--- a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
index b7ea1a99a1f84..c21d969f376c3 100644
--- a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175324_terraform_reports.yml b/config/metrics/counts_all/20210216175324_terraform_reports.yml
index 7694a8fd2fd4f..ab6ad011bbe36 100644
--- a/config/metrics/counts_all/20210216175324_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175324_terraform_reports.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.terraform_reports
 description: Count of Terraform MR reports generated
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175326_terraform_states.yml b/config/metrics/counts_all/20210216175326_terraform_states.yml
index 0c1c27335ccef..be641fbb6bd38 100644
--- a/config/metrics/counts_all/20210216175326_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175326_terraform_states.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
index a9f0eb521d910..c31d9ad883549 100644
--- a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
index 44ff075ea0ef4..594ef109d84f0 100644
--- a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
index 9b92d67d09b86..4bc9134843553 100644
--- a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
index 5bd5d52f8ab45..1abcca11a748e 100644
--- a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175337_clusters_management_project.yml b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
index f137981b7fdb4..8a7823e3ce208 100644
--- a/config/metrics/counts_all/20210216175337_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175339_clusters_disabled.yml b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
index 15becf3a739eb..0831a29f105ce 100644
--- a/config/metrics/counts_all/20210216175339_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175341_clusters_enabled.yml b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
index 2a5d932ccf5a1..bfa807da1d084 100644
--- a/config/metrics/counts_all/20210216175341_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
index 2847e56bbcf14..dc22b8137fda4 100644
--- a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
index 52af7411aae44..3b74dd322b402 100644
--- a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
index 53ec537593703..4e4a77559b036 100644
--- a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
index 278261441915d..1a29d8f999b2c 100644
--- a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
index 4e26fef5e62c6..6ca1bd555b37b 100644
--- a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
index 07651126a418f..059145c82cc4b 100644
--- a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
index 72182fde57428..440badea7507b 100644
--- a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
index a8b21924a1bfb..c39fa60b34820 100644
--- a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
index 80ac8ff67e3ce..4d75f1c9ed857 100644
--- a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
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 ab1a286bc0cd8..60fb405b9f809 100644
--- a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
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 7e9b163f23a23..ef8bb634b854e 100644
--- a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
+++ b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 23c3beb281221..067ac95782ffa 100644
--- a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
+++ b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
index 1b3448efecc9a..e0a037ffedb70 100644
--- a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
+++ b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175448_network_policy_drops.yml b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
index 54b947599a967..84f12746762ca 100644
--- a/config/metrics/counts_all/20210216175448_network_policy_drops.yml
+++ b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
index 8db0a0bd4d636..55dc3b6ca3b1f 100644
--- a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
+++ b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
index a663a49b88e7f..c21b1d24885a7 100644
--- a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
+++ b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
index 44bf44bd20a30..a4f4910cf7658 100644
--- a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
+++ b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 7de28e4253303..4a3717786be5e 100644
--- a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
+++ b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175510_ci_builds.yml b/config/metrics/counts_all/20210216175510_ci_builds.yml
index 74f9d3963a714..be1a41b2e6678 100644
--- a/config/metrics/counts_all/20210216175510_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175510_ci_builds.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
index 85db2d7eed12f..2d2045f9c1f5b 100644
--- a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
index 31f948b0eb711..5d7f1c08f463b 100644
--- a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
index e3a379ed21ef9..b9f190169f1ee 100644
--- a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 1c03e614c6ea1..b85acf9129634 100644
--- a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175520_ci_runners.yml b/config/metrics/counts_all/20210216175520_ci_runners.yml
index 185783bf693ec..5016a85d1d74c 100644
--- a/config/metrics/counts_all/20210216175520_ci_runners.yml
+++ b/config/metrics/counts_all/20210216175520_ci_runners.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175521_ci_triggers.yml b/config/metrics/counts_all/20210216175521_ci_triggers.yml
index b6452ca45f240..6c1e063655d33 100644
--- a/config/metrics/counts_all/20210216175521_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175521_ci_triggers.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
index f136cb35ac558..13a3ef123b408 100644
--- a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175525_ci_builds.yml b/config/metrics/counts_all/20210216175525_ci_builds.yml
index 3b857e8bb0d1a..16a662f14f08f 100644
--- a/config/metrics/counts_all/20210216175525_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175525_ci_builds.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
index 827bcbcd2e29c..fefa76da1e7e2 100644
--- a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
index 1e1a1ee7af3c9..82bb3aaf3c225 100644
--- a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
index 3b9790f9b7114..2b02a1ea8a9e5 100644
--- a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 6763d3f0f109e..39f6122430666 100644
--- a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
@@ -17,4 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
index 3c882f1f759ee..37abe8569a9ee 100644
--- a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175537_ci_pipelines.yml b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
index f6fb62945f0e6..c64a595c11282 100644
--- a/config/metrics/counts_all/20210216175537_ci_pipelines.yml
+++ b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175539_ci_triggers.yml b/config/metrics/counts_all/20210216175539_ci_triggers.yml
index 5a0e630993c2f..03bae21fbd31f 100644
--- a/config/metrics/counts_all/20210216175539_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175539_ci_triggers.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175621_web_hooks.yml b/config/metrics/counts_all/20210216175621_web_hooks.yml
index 9c7f000ae5043..1c3ea0343458f 100644
--- a/config/metrics/counts_all/20210216175621_web_hooks.yml
+++ b/config/metrics/counts_all/20210216175621_web_hooks.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: counts.web_hooks
-description: 
+description:
 product_section: dev
 product_stage: ecosystem
 product_group: group::integrations
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175623_projects_asana_active.yml b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
index 67b7ef9847152..1cc4435718a7e 100644
--- a/config/metrics/counts_all/20210216175623_projects_asana_active.yml
+++ b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175625_groups_asana_active.yml b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
index 2fa25aa0bc18e..68f8ddbb8e5cd 100644
--- a/config/metrics/counts_all/20210216175625_groups_asana_active.yml
+++ b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175627_templates_asana_active.yml b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
index e0348f0760bf5..f80b599d291c1 100644
--- a/config/metrics/counts_all/20210216175627_templates_asana_active.yml
+++ b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175628_instances_asana_active.yml b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
index daad2b4f7ad6f..072569b3f0e0f 100644
--- a/config/metrics/counts_all/20210216175628_instances_asana_active.yml
+++ b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 adfe86ba5e0a7..a7dfab4b4e2f6 100644
--- a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 c08e3762d5377..27e3b6435b6ff 100644
--- a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
index 892b7723ba0ad..f889554204d7a 100644
--- a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
index 7a0a02c3f34ef..72b3b6525c673 100644
--- a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
index c086738726138..bce06ac5b9449 100644
--- a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
index 9ae2d48a68305..97b742af9e204 100644
--- a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 ec1402be55d3f..58e5cbc463ad0 100644
--- a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 eed75f72abd95..c4a3e97f5dd18 100644
--- a/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
index 0d7f1b4b22f21..de457accbc6bf 100644
--- a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
index e6379a4bfed4c..0ddb914206957 100644
--- a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
index e3c0882e78164..44ec35777237c 100644
--- a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
index 61af43bb5e4e9..2819b9538663c 100644
--- a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 5670c7dd7b125..37cf4b6a5c9e6 100644
--- a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 e71b6d1d89e50..91d4c1ee87cfe 100644
--- a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
index 16af8eb9792ed..2ae5655f3b0cb 100644
--- a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
index fe14026cd090e..db4c0e668f04a 100644
--- a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
index 99426d2a4180f..5a80e37f55687 100644
--- a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
index f727c33a00974..155f942f2e7c9 100644
--- a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 375680322fc06..c6f74ebb5b85d 100644
--- a/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 58a5665b089c6..c0d7ad2d345fd 100644
--- a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
index 36ccdfc3bb441..168ac1af9fc34 100644
--- a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
index eef27850d5e7a..5d4b21b1fbdfe 100644
--- a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
index 70b1f66c6f289..125f0e4735668 100644
--- a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
index ce52864f710b7..37a6624530335 100644
--- a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 409ea6b9d5d60..7d7a7c2e07516 100644
--- a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 6dd3e52aa899c..24f7f58ecaa6c 100644
--- a/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
index 068b6ca70bd71..9f7dfb89153a6 100644
--- a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
index 81b57aaa2b7ad..eedc3e7bf58c4 100644
--- a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
index 489e1ff085dd4..7fc6331367bac 100644
--- a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
index ce01b949a43e6..ef9d4cb6944ac 100644
--- a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 2de7329aaceca..ad5bf3fe8eda4 100644
--- a/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 4639d011005cb..a5b5f00909822 100644
--- a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
index 29420ee10e730..bb2f1f0158f4d 100644
--- a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
index 5ee10fc89bd5e..7de039a27c2b3 100644
--- a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
index 4e8db8fe03123..d059c1f09ad13 100644
--- a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
index eda4940cc6d9f..27cd481b3c214 100644
--- a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 925341c3c81bb..120c5c584a8d9 100644
--- a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 d91c8dcd08daa..4b5cc064e923f 100644
--- a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 f1d02dcdb9c76..baa22cf5d8bee 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 db1c010768652..a3d742e55747d 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 8a60d0a3c5faa..fec328053dc81 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 3f2658ffbde5a..e1b07c4709a2a 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 cad81761f769f..807a2486a2ede 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 20b3fbe3ba032..0f6b2b3eed38c 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175753_projects_discord_active.yml b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
index e0973b0bffcd7..e77370d11f92c 100644
--- a/config/metrics/counts_all/20210216175753_projects_discord_active.yml
+++ b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175755_groups_discord_active.yml b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
index f3fd18b35823f..44a297f26e7f3 100644
--- a/config/metrics/counts_all/20210216175755_groups_discord_active.yml
+++ b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175756_templates_discord_active.yml b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
index 0e16a045af24e..724369709a4f7 100644
--- a/config/metrics/counts_all/20210216175756_templates_discord_active.yml
+++ b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175758_instances_discord_active.yml b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
index 12d230f416916..5f1461dd4cab8 100644
--- a/config/metrics/counts_all/20210216175758_instances_discord_active.yml
+++ b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 2dd434f3642fc..afc14749b83ec 100644
--- a/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 16f962bd7bf2d..cae6b268640b4 100644
--- a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 c0de6ead30e1e..1450d1dd4efcd 100644
--- a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 c2824b4c17961..2236393cce3b7 100644
--- a/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 8ee28df4d7415..81a87abede803 100644
--- a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 de5f27210ae11..a580eeb991135 100644
--- a/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 4d9e656fb283e..0323c54abcf37 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 cb8883accf3e6..36776e486d940 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 01a94735afc80..a7cd15bd97064 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 67aa24bf260d9..b1bb762b3317c 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 a73d3bf2eca7c..9784c2db282eb 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 3b2d47f996f81..ff6d8d935c0c4 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 fba967b763711..8fa32ba188f17 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 4770cec8031d1..d85bbefbc1f16 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 2d59b82103405..ad6873aa0298b 100644
--- a/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 9bf2573d8cf12..5191174b03f2a 100644
--- a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 6eec57b84da1f..d7e17564f964c 100644
--- a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 e69007baa075f..8ff6ce868cac9 100644
--- a/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 7926a9e8afd0d..afa54a16d86ca 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 5afd44dd6c9eb..0e9b52ce806c6 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
index b291a420ee072..d6f6de24068e9 100644
--- a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
index 372d6d70b9971..21a9256da6b91 100644
--- a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
index 8fdd17db523a8..37d5ce81f12dd 100644
--- a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
index 0ee29e5eafc1d..6b28b5f5cd84f 100644
--- a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 f235a68138acf..48025839c037e 100644
--- a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 613f77a7823f4..558edfc4e6216 100644
--- a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 b65bdf26462a7..b22c8c633ed3c 100644
--- a/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 f66a539058580..5299718008f8c 100644
--- a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 0660b43acdbe2..945473b3c35dc 100644
--- a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 760b2ae013035..401760532638d 100644
--- a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 b012752e10063..a2753b7f000cc 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 314f03f9c44a2..27c34ef851af2 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
index 04bf41281d1fa..b1e5dfecea41b 100644
--- a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
index 6d1b376d473e1..444bbafc51612 100644
--- a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
index 1ad29856e8b9b..40db443b1504c 100644
--- a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
index 17b27862eb8b2..ef7548871848f 100644
--- a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 3926629d84efc..d93814d3b7197 100644
--- a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 db64df5e880f8..75fbbb12034a1 100644
--- a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175921_projects_irker_active.yml b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
index 6aa1dce7279ee..024be65ab2188 100644
--- a/config/metrics/counts_all/20210216175921_projects_irker_active.yml
+++ b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175923_groups_irker_active.yml b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
index 23dee4faa99f9..4df751374464a 100644
--- a/config/metrics/counts_all/20210216175923_groups_irker_active.yml
+++ b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175924_templates_irker_active.yml b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
index eff644775cce8..bb821cd9ee93e 100644
--- a/config/metrics/counts_all/20210216175924_templates_irker_active.yml
+++ b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175926_instances_irker_active.yml b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
index ce785139cdbec..9de79edaee784 100644
--- a/config/metrics/counts_all/20210216175926_instances_irker_active.yml
+++ b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 84f11bfbbfb87..e503701d79833 100644
--- a/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 bb7fe5bd2bd1e..341e32bde2ef8 100644
--- a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
index 52c1332cf9a39..a7126bf0a92cb 100644
--- a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
index 04045aaa42810..765d955613789 100644
--- a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
index 1cf5485d7a48a..5e24a79288769 100644
--- a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
index 2c54388e9f424..79f539216b4be 100644
--- a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 b5eed44d695be..da54fad496cdb 100644
--- a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 ba255d1b3a92b..1789f36acaa6d 100644
--- a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175943_projects_jira_active.yml b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
index fa63e02db35c9..92866092aeb09 100644
--- a/config/metrics/counts_all/20210216175943_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175945_groups_jira_active.yml b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
index 49cc71aeb61b5..a8ab0507d8efa 100644
--- a/config/metrics/counts_all/20210216175945_groups_jira_active.yml
+++ b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175946_templates_jira_active.yml b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
index d643ad4438718..51721ed79362c 100644
--- a/config/metrics/counts_all/20210216175946_templates_jira_active.yml
+++ b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175948_instances_jira_active.yml b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
index 4b251b686402f..7728019b87acf 100644
--- a/config/metrics/counts_all/20210216175948_instances_jira_active.yml
+++ b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 1b11fa56c6f27..3222eb5fc1aee 100644
--- a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 68e82a030c87e..647c1274281fc 100644
--- a/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
index f8c7edb9f406d..7e3ee671d3050 100644
--- a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
index 92c072c2c85b9..360e2f465663b 100644
--- a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
index d935e0a86b075..959fabec93dac 100644
--- a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
index f7fe5081472cc..9a1b30ab0565a 100644
--- a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 34b74f6ab2884..246f5b8ec68bd 100644
--- a/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 68576193e3afe..333e6e9fa9223 100644
--- a/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 d95571b0fb8a4..2028173499a41 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 6ce8be4a8bedf..dda7195ea647d 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 d9255db7311bf..6eac8da9b05fe 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 ad5e011a21cc2..f936fd4b1ade0 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 4a26a69ed37c0..efb912998edc5 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
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 4c2deca981c8d..37f4b243e7ba9 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
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 ff25e7fe72a53..a1e661b9ad533 100644
--- a/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 2afa40977b1f3..25c3cd360646f 100644
--- a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 4ac134394fcb9..ff1a23e1b5f92 100644
--- a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 e78ae2b741174..22d89621a0380 100644
--- a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 73791545ea698..cd81148870392 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 a1300f264f610..89ef9460b5ce6 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
index a009cb2045ecd..1f9456729cd17 100644
--- a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
index efcd3dbd39c95..195c5718c1b66 100644
--- a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
index f6a337662b822..2def57be06075 100644
--- a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
index 41693d7a98490..cf3eb9049773f 100644
--- a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 08073ec5aa957..7c338ceba6df8 100644
--- a/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 e431c52ad43e3..7f53c894fb676 100644
--- a/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 83f9c5b734254..0fa095a27de51 100644
--- a/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 a705d1e2da660..9af7ca2793155 100644
--- a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 df1bf53c012db..2139b3ae6d00e 100644
--- a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 a759da8865a1b..39a979e85043d 100644
--- a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 7f3366977168b..f6c136ae24f1e 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 049343d22f62a..2582f65343312 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
index 5330268e0794b..9be062f8de9eb 100644
--- a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
index 3d077219657da..ba688786b5f61 100644
--- a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
index 183417d566c8c..f2babdbcf1a0d 100644
--- a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
index adeec68290a8e..49de98e670180 100644
--- a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 c9f6ba7680a64..7f108a6a2c3ca 100644
--- a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 b247a3b48e4be..5abba518e8ad3 100644
--- a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
index 1f5635f56da63..8ae09814aae0a 100644
--- a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
index 5a8225f97a35f..bfc825994e49a 100644
--- a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
index 79ea70fc7fad3..63476b4e0cdac 100644
--- a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
index cfe8f5170d1f1..bc793094aa100 100644
--- a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 25942eb52ec55..38d11261fba58 100644
--- a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 941fe56037ae9..a69ef94d87a77 100644
--- a/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
index b19251acb7987..eb36236fd064d 100644
--- a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
index 5bb559e9f247d..aa62c1f237c7e 100644
--- a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
index 3a173346fa8d1..9f3705a2a4812 100644
--- a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
index 17974b6f1575c..7280f0f82044c 100644
--- a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 8c94c811d69ac..fda80b11b8a6b 100644
--- a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 459b97667eb02..66417c1064206 100644
--- a/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180122_projects_slack_active.yml b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
index 4663d4b516c0d..9c62e852b4434 100644
--- a/config/metrics/counts_all/20210216180122_projects_slack_active.yml
+++ b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180124_groups_slack_active.yml b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
index 14c7bab4c7757..c4cdd4c70b765 100644
--- a/config/metrics/counts_all/20210216180124_groups_slack_active.yml
+++ b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180126_templates_slack_active.yml b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
index 22a205d7d4ca7..8aca7c44ec272 100644
--- a/config/metrics/counts_all/20210216180126_templates_slack_active.yml
+++ b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180127_instances_slack_active.yml b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
index 8c9155ce5abb7..6493a89712a66 100644
--- a/config/metrics/counts_all/20210216180127_instances_slack_active.yml
+++ b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 0b3dae20a6ec6..89856214e6245 100644
--- a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 93ca97e00e5f4..f2af9cc2bc399 100644
--- a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 d98029d89ad87..8d5ddd2da1090 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 f1434b65fbfb8..ed2e0a700b9ce 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 48edd9813ef4d..8e26090955e06 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 7cd8c1de0be13..63ff1e411733d 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 c28b0116702d3..f77fb73010616 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 e94e5d173bd31..12d80cc157c34 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
index 4c6c5c6c51903..b333ed1bb53b7 100644
--- a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
index 20a719dbefbe2..eccb558f02f46 100644
--- a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
index 5e8ea66b008db..e3864612aa34d 100644
--- a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
index f02df75cc87b0..ad961cce92287 100644
--- a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 54121809d981a..be93bc02ba492 100644
--- a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 33a126b4d0ca8..329154f48d075 100644
--- a/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 be5ddb6089164..32296e20f1964 100644
--- a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 ca03f75a3951f..81f3a32578345 100644
--- a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 77d402bdd52c6..e47586a4adbee 100644
--- a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 7e789cdb67f42..7475cd17c6509 100644
--- a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 4b5e83b2fea60..fce93504c1025 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 55644e584d614..4ee6902f7e37f 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 d6284cb68fd6b..29056da213a87 100644
--- a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 7ef4fe1ca419f..187ae3d63226c 100644
--- a/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 e461f99e59608..c43f7ad3ebfe6 100644
--- a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 c82e1a34b19f5..bfcf88b111aff 100644
--- a/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 e16b7177fb38f..705aa3190c648 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 31737003f3979..c14055c5d8f98 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
index 9361edb0a122d..25e1298436671 100644
--- a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
index a2fa39722b308..10b07bb5c029b 100644
--- a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
index bd32fd5eb6e08..fff16f6ece41c 100644
--- a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
index cb160d513b02c..14b513317b561 100644
--- a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 875620ff2ba82..8f446518109e9 100644
--- a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 34f0c8f93fa7b..87139a187c1f3 100644
--- a/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 8870013fc2b32..e0f5dd0e82405 100644
--- a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
+++ b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 adf7098e71cf8..f03a4adac3264 100644
--- a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 33be7ef4f87b7..02e1eccafee3c 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 b7fa31e101e6c..5899537f778f6 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180239_personal_snippets.yml b/config/metrics/counts_all/20210216180239_personal_snippets.yml
index ea8404a616336..a31a0919ec9ee 100644
--- a/config/metrics/counts_all/20210216180239_personal_snippets.yml
+++ b/config/metrics/counts_all/20210216180239_personal_snippets.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180241_project_snippets.yml b/config/metrics/counts_all/20210216180241_project_snippets.yml
index 1f915327d3947..d5ff82c0ae925 100644
--- a/config/metrics/counts_all/20210216180241_project_snippets.yml
+++ b/config/metrics/counts_all/20210216180241_project_snippets.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180242_web_ide_commits.yml b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
index c85dd1f876cd1..2fde4424a602a 100644
--- a/config/metrics/counts_all/20210216180242_web_ide_commits.yml
+++ b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180244_web_ide_views.yml b/config/metrics/counts_all/20210216180244_web_ide_views.yml
index 222e92482e975..1b9b7aaab7efb 100644
--- a/config/metrics/counts_all/20210216180244_web_ide_views.yml
+++ b/config/metrics/counts_all/20210216180244_web_ide_views.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 c5e50275878a6..f5cabb039b47e 100644
--- a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180248_web_ide_previews.yml b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
index b4c349e5cc314..17d85a7174b0e 100644
--- a/config/metrics/counts_all/20210216180248_web_ide_previews.yml
+++ b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
index d451222dfd436..425e3cd6410a7 100644
--- a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
+++ b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
index 562f63814875a..f59cb5a868933 100644
--- a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
+++ b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180253_snippet_comment.yml b/config/metrics/counts_all/20210216180253_snippet_comment.yml
index efc079fa13e19..8f657de503783 100644
--- a/config/metrics/counts_all/20210216180253_snippet_comment.yml
+++ b/config/metrics/counts_all/20210216180253_snippet_comment.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180255_snippet_create.yml b/config/metrics/counts_all/20210216180255_snippet_create.yml
index 4303deb1aeb58..9c0e2d5cd4466 100644
--- a/config/metrics/counts_all/20210216180255_snippet_create.yml
+++ b/config/metrics/counts_all/20210216180255_snippet_create.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180257_snippet_update.yml b/config/metrics/counts_all/20210216180257_snippet_update.yml
index d59f2a63a4271..bee3fb477a698 100644
--- a/config/metrics/counts_all/20210216180257_snippet_update.yml
+++ b/config/metrics/counts_all/20210216180257_snippet_update.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 684bf25af1096..37d87abf57c34 100644
--- a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
+++ b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
@@ -20,3 +20,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
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 046448d551a82..9dda088ef5180 100644
--- a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
+++ b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 62741924580ca..3d9855fc624a7 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 ed85c6ba21def..cff5414898676 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180306_snippets.yml b/config/metrics/counts_all/20210216180306_snippets.yml
index 5dcf43846e6ae..aa98cb2347591 100644
--- a/config/metrics/counts_all/20210216180306_snippets.yml
+++ b/config/metrics/counts_all/20210216180306_snippets.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180316_snippets.yml b/config/metrics/counts_all/20210216180316_snippets.yml
index f975500f3e6ee..cd4324fd20ea0 100644
--- a/config/metrics/counts_all/20210216180316_snippets.yml
+++ b/config/metrics/counts_all/20210216180316_snippets.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180410_pool_repositories.yml b/config/metrics/counts_all/20210216180410_pool_repositories.yml
index 06a65c536dd29..6920977d2ce59 100644
--- a/config/metrics/counts_all/20210216180410_pool_repositories.yml
+++ b/config/metrics/counts_all/20210216180410_pool_repositories.yml
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180413_all_searches.yml b/config/metrics/counts_all/20210216180413_all_searches.yml
index b9a3374b333e7..ce425b0fe784b 100644
--- a/config/metrics/counts_all/20210216180413_all_searches.yml
+++ b/config/metrics/counts_all/20210216180413_all_searches.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180414_navbar_searches.yml b/config/metrics/counts_all/20210216180414_navbar_searches.yml
index 5cceeecff8a8f..294fac727d616 100644
--- a/config/metrics/counts_all/20210216180414_navbar_searches.yml
+++ b/config/metrics/counts_all/20210216180414_navbar_searches.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.navbar_searches
-description: Total Searches using the navbar for All Basic Search and Advanced Search in self-managed and SaaS
+description: Total Searches using the navbar for All Basic Search and Advanced Search
+  in self-managed and SaaS
 product_section: enablement
 product_stage: enablement
 product_group: group::global search
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180416_i_search_total.yml b/config/metrics/counts_all/20210216180416_i_search_total.yml
index 0e8a7cfecf09b..27ebfb38c47b2 100644
--- a/config/metrics/counts_all/20210216180416_i_search_total.yml
+++ b/config/metrics/counts_all/20210216180416_i_search_total.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml b/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
index 67fac53ec4e2d..25eec6cd18f6b 100644
--- a/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
+++ b/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml b/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
index c840150b20538..8b1ce7afa41f3 100644
--- a/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
+++ b/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml b/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
index e69555757d8c5..f3cd37a90c3a3 100644
--- a/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
+++ b/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml b/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
index aebb69d4fe74f..11915b55b5881 100644
--- a/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
+++ b/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
index dcce2f4e36686..182884b61525d 100644
--- a/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
+++ b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml b/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
index 373a5e6c262f9..e028f6a625ce9 100644
--- a/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
+++ b/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml b/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
index a72f821f1e771..779f4e4b68cb6 100644
--- a/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
+++ b/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180447_incident_issues.yml b/config/metrics/counts_all/20210216180447_incident_issues.yml
index bc3dd346e4d84..2fcfc8049e356 100644
--- a/config/metrics/counts_all/20210216180447_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180447_incident_issues.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml b/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
index 5fa90b9f6c127..087af80eabf19 100644
--- a/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml b/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
index 9764d0cba4cde..80405762443aa 100644
--- a/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
+++ b/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
index 10f2abcfb849d..f199df997d4c3 100644
--- a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
+++ b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml b/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
index c5c4a1e90bf5b..cfedcabdbd334 100644
--- a/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml b/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
index f162e767cbee5..609760e25c6ea 100644
--- a/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
+++ b/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
index bfca848f0fdfd..f725272551c03 100644
--- a/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
+++ b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml b/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
index 6b37f627c954e..bf47d0e584019 100644
--- a/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
+++ b/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml b/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
index b6de290e3ee35..6e6e1c19d4574 100644
--- a/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
index 5ed0d61b5d1a8..d375aa0d49f7c 100644
--- a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
+++ b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
index 9a0d7e145660f..cd23a79f23cde 100644
--- a/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
index 967e060db39ff..87b8fe61ea9fb 100644
--- a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml b/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
index 51dd7a63ba47b..d28483d96ba4d 100644
--- a/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
index f2ee013002c54..95f1acc625474 100644
--- a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
+++ b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180634_gitlab.yml b/config/metrics/counts_all/20210216180634_gitlab.yml
index c578ff7bab018..c157ae84873a4 100644
--- a/config/metrics/counts_all/20210216180634_gitlab.yml
+++ b/config/metrics/counts_all/20210216180634_gitlab.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180636_gitlab_v1.yml b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
index 80cf9db3e46e4..c20a53d70077e 100644
--- a/config/metrics/counts_all/20210216180636_gitlab_v1.yml
+++ b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180638_gitlab_project.yml b/config/metrics/counts_all/20210216180638_gitlab_project.yml
index 60f3a0e6bd617..7163012b9d22b 100644
--- a/config/metrics/counts_all/20210216180638_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180638_gitlab_project.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180639_gitlab.yml b/config/metrics/counts_all/20210216180639_gitlab.yml
index 66b4511cc7598..e0852a13b37da 100644
--- a/config/metrics/counts_all/20210216180639_gitlab.yml
+++ b/config/metrics/counts_all/20210216180639_gitlab.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180641_github.yml b/config/metrics/counts_all/20210216180641_github.yml
index 6ebb762be0d64..e34d73c118e6e 100644
--- a/config/metrics/counts_all/20210216180641_github.yml
+++ b/config/metrics/counts_all/20210216180641_github.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180643_bitbucket.yml b/config/metrics/counts_all/20210216180643_bitbucket.yml
index 1b683d1414d15..cf4aebc8da891 100644
--- a/config/metrics/counts_all/20210216180643_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180643_bitbucket.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180645_bitbucket_server.yml b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
index a7d6481a0d1b5..906771490e888 100644
--- a/config/metrics/counts_all/20210216180645_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180647_gitea.yml b/config/metrics/counts_all/20210216180647_gitea.yml
index 4cf1ebfd78fe2..d4260d42cf0da 100644
--- a/config/metrics/counts_all/20210216180647_gitea.yml
+++ b/config/metrics/counts_all/20210216180647_gitea.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180649_git.yml b/config/metrics/counts_all/20210216180649_git.yml
index 9c60f4a230262..03b3f7f348166 100644
--- a/config/metrics/counts_all/20210216180649_git.yml
+++ b/config/metrics/counts_all/20210216180649_git.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180650_manifest.yml b/config/metrics/counts_all/20210216180650_manifest.yml
index ee1037328deaa..26429d863a3e7 100644
--- a/config/metrics/counts_all/20210216180650_manifest.yml
+++ b/config/metrics/counts_all/20210216180650_manifest.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180652_gitlab_migration.yml b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
index 8aa45dee4346c..d40fb3b248424 100644
--- a/config/metrics/counts_all/20210216180652_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180654_jira.yml b/config/metrics/counts_all/20210216180654_jira.yml
index 7c7a273957685..bc5311ecdd4b4 100644
--- a/config/metrics/counts_all/20210216180654_jira.yml
+++ b/config/metrics/counts_all/20210216180654_jira.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180656_fogbugz.yml b/config/metrics/counts_all/20210216180656_fogbugz.yml
index 2d4e5ddcc0210..9ab769a65fba8 100644
--- a/config/metrics/counts_all/20210216180656_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180656_fogbugz.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180658_phabricator.yml b/config/metrics/counts_all/20210216180658_phabricator.yml
index e5cdd3f382baf..79e9f388c613c 100644
--- a/config/metrics/counts_all/20210216180658_phabricator.yml
+++ b/config/metrics/counts_all/20210216180658_phabricator.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180700_csv.yml b/config/metrics/counts_all/20210216180700_csv.yml
index b69251a5b0b4f..6b20096987b83 100644
--- a/config/metrics/counts_all/20210216180700_csv.yml
+++ b/config/metrics/counts_all/20210216180700_csv.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180702_group_import.yml b/config/metrics/counts_all/20210216180702_group_import.yml
index 45e2650d69e4e..36949d4480815 100644
--- a/config/metrics/counts_all/20210216180702_group_import.yml
+++ b/config/metrics/counts_all/20210216180702_group_import.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180703_gitlab_migration.yml b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
index 10b549ca252ee..ab4acf2a2bec9 100644
--- a/config/metrics/counts_all/20210216180703_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180705_total.yml b/config/metrics/counts_all/20210216180705_total.yml
index ca7cab549c170..5d76fd3873b10 100644
--- a/config/metrics/counts_all/20210216180705_total.yml
+++ b/config/metrics/counts_all/20210216180705_total.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180707_gitlab_project.yml b/config/metrics/counts_all/20210216180707_gitlab_project.yml
index 3ed628fd20d10..f0d513e80b37b 100644
--- a/config/metrics/counts_all/20210216180707_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180707_gitlab_project.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.gitlab_project
-description: 'Distinct count of users that imported projects using Project Import/Export'
+description: Distinct count of users that imported projects using Project Import/Export
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180709_gitlab.yml b/config/metrics/counts_all/20210216180709_gitlab.yml
index d8c23badb74c3..ea5e3b257757f 100644
--- a/config/metrics/counts_all/20210216180709_gitlab.yml
+++ b/config/metrics/counts_all/20210216180709_gitlab.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.gitlab
-description: 'Distinct count of users that imported projects from GitLab.com'
+description: Distinct count of users that imported projects from GitLab.com
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180711_github.yml b/config/metrics/counts_all/20210216180711_github.yml
index 4c7444c7805a2..cd3fd06d0576a 100644
--- a/config/metrics/counts_all/20210216180711_github.yml
+++ b/config/metrics/counts_all/20210216180711_github.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180713_bitbucket.yml b/config/metrics/counts_all/20210216180713_bitbucket.yml
index 2d3dc15432484..d0eb23fc41a9f 100644
--- a/config/metrics/counts_all/20210216180713_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180713_bitbucket.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.bitbucket
-description: 'Distinct count of users that imported projects from Bitbucket Cloud'
+description: Distinct count of users that imported projects from Bitbucket Cloud
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180715_bitbucket_server.yml b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
index 82a675b5428d2..9a3de0cb33051 100644
--- a/config/metrics/counts_all/20210216180715_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.bitbucket_server
-description: 'Distinct count of users that imported projects from Bitbucket Server'
+description: Distinct count of users that imported projects from Bitbucket Server
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180716_gitea.yml b/config/metrics/counts_all/20210216180716_gitea.yml
index 50d5923e37722..b107b213a30d6 100644
--- a/config/metrics/counts_all/20210216180716_gitea.yml
+++ b/config/metrics/counts_all/20210216180716_gitea.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.gitea
-description: 'Distinct count of users that imported projects from Gitea'
+description: Distinct count of users that imported projects from Gitea
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180718_git.yml b/config/metrics/counts_all/20210216180718_git.yml
index f9f648bb713d3..0cd399a65ec8b 100644
--- a/config/metrics/counts_all/20210216180718_git.yml
+++ b/config/metrics/counts_all/20210216180718_git.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.git
-description: 'Distinct count of users that imported projects using Import by URL'
+description: Distinct count of users that imported projects using Import by URL
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180720_manifest.yml b/config/metrics/counts_all/20210216180720_manifest.yml
index 28b689eddcfe9..b91ae015f6ef9 100644
--- a/config/metrics/counts_all/20210216180720_manifest.yml
+++ b/config/metrics/counts_all/20210216180720_manifest.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.manifest
-description: 'Distinct count of users that imported projects using Manifest file'
+description: Distinct count of users that imported projects using Manifest file
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180722_jira.yml b/config/metrics/counts_all/20210216180722_jira.yml
index add51bcf494dc..89ea9da081d8c 100644
--- a/config/metrics/counts_all/20210216180722_jira.yml
+++ b/config/metrics/counts_all/20210216180722_jira.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180724_fogbugz.yml b/config/metrics/counts_all/20210216180724_fogbugz.yml
index 45dd4ee1f50aa..e9cb315930101 100644
--- a/config/metrics/counts_all/20210216180724_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180724_fogbugz.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.issues_imported.fogbugz
-description: 'Distinct count of users that imported issues into projects using FogBugz'
+description: Distinct count of users that imported issues into projects using FogBugz
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180726_phabricator.yml b/config/metrics/counts_all/20210216180726_phabricator.yml
index c006ac22b7536..933047aff583f 100644
--- a/config/metrics/counts_all/20210216180726_phabricator.yml
+++ b/config/metrics/counts_all/20210216180726_phabricator.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180727_csv.yml b/config/metrics/counts_all/20210216180727_csv.yml
index 6a6f16e09ef63..e6bc3eba97354 100644
--- a/config/metrics/counts_all/20210216180727_csv.yml
+++ b/config/metrics/counts_all/20210216180727_csv.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180729_groups_imported.yml b/config/metrics/counts_all/20210216180729_groups_imported.yml
index 04e1febb4379b..32e968c76e23e 100644
--- a/config/metrics/counts_all/20210216180729_groups_imported.yml
+++ b/config/metrics/counts_all/20210216180729_groups_imported.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
index 25326291509c1..e21c5065e3f0a 100644
--- a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
+++ b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
index 82736e363ae61..138c849da6196 100644
--- a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
+++ b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
index 26b88ba5c9fc2..4f2071cfc56e7 100644
--- a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
+++ b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 3332d1963ba4f..f9a258917c1f8 100644
--- a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
+++ b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 3911079ef56ed..64275cda6f31b 100644
--- a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
+++ b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 c6900276ef7a9..830793d027976 100644
--- a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
+++ b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180750_groups.yml b/config/metrics/counts_all/20210216180750_groups.yml
index 6163cbab8ad51..40800b4922136 100644
--- a/config/metrics/counts_all/20210216180750_groups.yml
+++ b/config/metrics/counts_all/20210216180750_groups.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180752_keys.yml b/config/metrics/counts_all/20210216180752_keys.yml
index d105e047d4955..4d6d5b4f0c720 100644
--- a/config/metrics/counts_all/20210216180752_keys.yml
+++ b/config/metrics/counts_all/20210216180752_keys.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180754_events.yml b/config/metrics/counts_all/20210216180754_events.yml
index 8d1a58f1820a3..19d9864ca318f 100644
--- a/config/metrics/counts_all/20210216180754_events.yml
+++ b/config/metrics/counts_all/20210216180754_events.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180756_groups.yml b/config/metrics/counts_all/20210216180756_groups.yml
index 938a95c59110e..fbd244b5078f7 100644
--- a/config/metrics/counts_all/20210216180756_groups.yml
+++ b/config/metrics/counts_all/20210216180756_groups.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180758_users_created.yml b/config/metrics/counts_all/20210216180758_users_created.yml
index 816887531b615..f160f72f85bcc 100644
--- a/config/metrics/counts_all/20210216180758_users_created.yml
+++ b/config/metrics/counts_all/20210216180758_users_created.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
index f46bc3b856630..2aea7f78569a7 100644
--- a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
+++ b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.grafana_integrated_projects
 description: Total Grafana integrations attached to projects
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
index 211115a08565a..9289a2e773e66 100644
--- a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_with_tracing_enabled
 description: Projects with tracing enabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: tracing
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
index 9b4c7e4e1452f..7b800fd9240fa 100644
--- a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_prometheus_active
 description: Count of projects with active integrations for Prometheus
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
index 44f7150cb66c4..5f084a84f5791 100644
--- a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_prometheus_active
 description: Count of groups with active integrations for Prometheus
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
index eba4f2f5741b4..ccd73b22e2add 100644
--- a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_prometheus_active
 description: Count of active service templates for Prometheus
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
index 3c03a3b2eae6d..c7b15121df3e0 100644
--- a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_prometheus_active
 description: Count of active instance-level integrations for Prometheus
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
index d89a809a613e8..2f5bdf392a546 100644
--- a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_prometheus_active
 description: Count of active projects inheriting integrations for Prometheus
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
index 0d3f11e9a1ae3..bd2b54244e21f 100644
--- a/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_prometheus_active
 description: Count of active groups inheriting integrations for Prometheus
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
index 3038e53932c8f..2403e85554700 100644
--- a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.operations_dashboard_default_dashboard
 description: Active users with enabled operations dashboard
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
index 4802532c053c8..244441dfec94d 100644
--- a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.operations_dashboard_users_with_projects_added
 description: Active users with projects on operations dashboard
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180945_clusters.yml b/config/metrics/counts_all/20210216180945_clusters.yml
index 2294cd5e1de58..ad31e5baaba07 100644
--- a/config/metrics/counts_all/20210216180945_clusters.yml
+++ b/config/metrics/counts_all/20210216180945_clusters.yml
@@ -11,9 +11,10 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
index a921b517b4092..4eaf4177888be 100644
--- a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
@@ -11,9 +11,10 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
index 278cd3d63370c..bd7e1aee0f57f 100644
--- a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
@@ -11,8 +11,9 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
+- free
+- premium
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
index 6d1d00cd1e3fb..bee04c0f88bab 100644
--- a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
@@ -11,9 +11,10 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
index 13971a4fc71d0..5f8d7a53c7e18 100644
--- a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
@@ -11,9 +11,10 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181009_lfs_objects.yml b/config/metrics/counts_all/20210216181009_lfs_objects.yml
index cb8b2fc547493..ec667b9fb9403 100644
--- a/config/metrics/counts_all/20210216181009_lfs_objects.yml
+++ b/config/metrics/counts_all/20210216181009_lfs_objects.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: counts.lfs_objects
-description: 
+description:
 product_section: ops
 product_stage: create
 product_group: group::create
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181011_projects_with_packages.yml b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
index 59edfc3634d20..a88af256510c9 100644
--- a/config/metrics/counts_all/20210216181011_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181012_packages.yml b/config/metrics/counts_all/20210216181012_packages.yml
index ec5e1ae783165..82437eb0f7c11 100644
--- a/config/metrics/counts_all/20210216181012_packages.yml
+++ b/config/metrics/counts_all/20210216181012_packages.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 14cefebb51435..42b62a8bd2f28 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 54ab06ea5c464..029bde8e35d30 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
index 3b742c6875810..4bd5870dff8ec 100644
--- a/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
+++ b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
index 1681e2c642e54..072a755004885 100644
--- a/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
+++ b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
index 3f5ee49993ae3..7e1f4f600d4db 100644
--- a/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
+++ b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
index a18a4fa12d8b9..a3c03f2b9cde8 100644
--- a/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
+++ b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
index bd7d576520e7d..15a69f8612b94 100644
--- a/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
+++ b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml b/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
index 420c428e46c0f..2c1e0a1176d7a 100644
--- a/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
+++ b/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 21cd670e5aa8c..e2c41f2a39372 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 d6b0d0dc1d688..bf6aa97530145 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 9c4d4b83be94d..29aa7d65c5dab 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 963665a5ee0cd..e40b0414d1a20 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 8fa068bb372f3..d6d3c3aad89b0 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 3742446b11ad4..409279f2b4dda 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_7d
-description: A count of projects with the cleanup policy set delete tags older than 7 days
+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
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 1216a041bfb3b..ee2bbbfad893a 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_14d
-description: A count of projects with the cleanup policy set delete tags older than 14 days
+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
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 387bf3dff9000..f9b21e5b25f95 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_30d
-description: A count of projects with the cleanup policy set delete tags older than 30 days
+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
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 8dcfbc1ce020e..ada20a988d0b1 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_90d
-description: A count of projects with the cleanup policy set delete tags older than 90 days
+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
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
index 29fe874c89ec7..6c59c8508a9ff 100644
--- a/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
+++ b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
+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
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 475b52f856f74..fbe29f5280ee7 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_unset
-description: A count of projects with the cleanup policy with the number of tags to delete unset
+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
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181051_vendor.yml b/config/metrics/counts_all/20210216181051_vendor.yml
index 840054e426311..907b58c78652f 100644
--- a/config/metrics/counts_all/20210216181051_vendor.yml
+++ b/config/metrics/counts_all/20210216181051_vendor.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 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
@@ -17,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181055_projects_with_packages.yml b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
index 99c51335b8071..b7f237e0f9361 100644
--- a/config/metrics/counts_all/20210216181055_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181102_issues.yml b/config/metrics/counts_all/20210216181102_issues.yml
index 8777da9942f77..646e2cb2942e2 100644
--- a/config/metrics/counts_all/20210216181102_issues.yml
+++ b/config/metrics/counts_all/20210216181102_issues.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181104_label_lists.yml b/config/metrics/counts_all/20210216181104_label_lists.yml
index 247e891e95660..96d16c74128a6 100644
--- a/config/metrics/counts_all/20210216181104_label_lists.yml
+++ b/config/metrics/counts_all/20210216181104_label_lists.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181108_milestones.yml b/config/metrics/counts_all/20210216181108_milestones.yml
index 720c7ae0bc025..7218e12549b42 100644
--- a/config/metrics/counts_all/20210216181108_milestones.yml
+++ b/config/metrics/counts_all/20210216181108_milestones.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181109_uploads.yml b/config/metrics/counts_all/20210216181109_uploads.yml
index 42ba5feb46d3f..b8955201e90f9 100644
--- a/config/metrics/counts_all/20210216181109_uploads.yml
+++ b/config/metrics/counts_all/20210216181109_uploads.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181111_labels.yml b/config/metrics/counts_all/20210216181111_labels.yml
index 3a0a200754ef7..48c44c6d62b7d 100644
--- a/config/metrics/counts_all/20210216181111_labels.yml
+++ b/config/metrics/counts_all/20210216181111_labels.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181113_notes.yml b/config/metrics/counts_all/20210216181113_notes.yml
index 5d2c4a029e3e8..53bb38582702b 100644
--- a/config/metrics/counts_all/20210216181113_notes.yml
+++ b/config/metrics/counts_all/20210216181113_notes.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181115_issues.yml b/config/metrics/counts_all/20210216181115_issues.yml
index 6dbb1b910e157..22b045cfa73ee 100644
--- a/config/metrics/counts_all/20210216181115_issues.yml
+++ b/config/metrics/counts_all/20210216181115_issues.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181117_notes.yml b/config/metrics/counts_all/20210216181117_notes.yml
index 20aa29d6d6fbd..236d283c4d402 100644
--- a/config/metrics/counts_all/20210216181117_notes.yml
+++ b/config/metrics/counts_all/20210216181117_notes.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181119_projects.yml b/config/metrics/counts_all/20210216181119_projects.yml
index 5384bacfec2a0..c448bcc1d7983 100644
--- a/config/metrics/counts_all/20210216181119_projects.yml
+++ b/config/metrics/counts_all/20210216181119_projects.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181121_todos.yml b/config/metrics/counts_all/20210216181121_todos.yml
index 562e7be5666ad..854540c7d2ff7 100644
--- a/config/metrics/counts_all/20210216181121_todos.yml
+++ b/config/metrics/counts_all/20210216181121_todos.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
index 73c975ecd1e26..de008dd935008 100644
--- a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181124_service_desk_issues.yml b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
index 521d0f42fbe2a..cd7c6aa1bf730 100644
--- a/config/metrics/counts_all/20210216181124_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181126_projects_jira_active.yml b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
index de8f7e5e57836..aaf9421602cd1 100644
--- a/config/metrics/counts_all/20210216181126_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
index 6dca1863e3ef1..19587d85f82a7 100644
--- a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.plan.projects_jira_dvcs_cloud_active
-description: Distinct count of creator_id from projects with an active Jira Cloud DVCS integration.
+description: Distinct count of creator_id from projects with an active Jira Cloud
+  DVCS integration.
 product_section: dev
 product_stage: ecosystem
 product_group: group::integration
@@ -17,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
index 2f37969e8ad7c..2e0bf2aaddad6 100644
--- a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.plan.projects_jira_dvcs_server_active
-description: Distinct count of creator_id from projects with an active Jira Server DVCS integration.
+description: Distinct count of creator_id from projects with an active Jira Server
+  DVCS integration.
 product_section: dev
 product_stage: ecosystem
 product_group: group::integration
@@ -17,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181134_epics.yml b/config/metrics/counts_all/20210216181134_epics.yml
index 339956d84df78..7c03b1b17d105 100644
--- a/config/metrics/counts_all/20210216181134_epics.yml
+++ b/config/metrics/counts_all/20210216181134_epics.yml
@@ -14,3 +14,4 @@ distribution:
 - ee
 tier:
 - premium
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181135_label_lists.yml b/config/metrics/counts_all/20210216181135_label_lists.yml
index f3f9d84993bbf..31b417541ce87 100644
--- a/config/metrics/counts_all/20210216181135_label_lists.yml
+++ b/config/metrics/counts_all/20210216181135_label_lists.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181249_feature_flags.yml b/config/metrics/counts_all/20210216181249_feature_flags.yml
index 1743569367341..a8265b49525f1 100644
--- a/config/metrics/counts_all/20210216181249_feature_flags.yml
+++ b/config/metrics/counts_all/20210216181249_feature_flags.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181252_boards.yml b/config/metrics/counts_all/20210216181252_boards.yml
index 91370f6192f9b..3771c37b1ed6d 100644
--- a/config/metrics/counts_all/20210216181252_boards.yml
+++ b/config/metrics/counts_all/20210216181252_boards.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181254_projects.yml b/config/metrics/counts_all/20210216181254_projects.yml
index ce9659cccc451..aac5fce1e8832 100644
--- a/config/metrics/counts_all/20210216181254_projects.yml
+++ b/config/metrics/counts_all/20210216181254_projects.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181256_todos.yml b/config/metrics/counts_all/20210216181256_todos.yml
index ab13c2b8d1179..78f4c3aff81b2 100644
--- a/config/metrics/counts_all/20210216181256_todos.yml
+++ b/config/metrics/counts_all/20210216181256_todos.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
index 13b0f38d16af1..38d4521317fff 100644
--- a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
+++ b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 4d807c3d33359..f5cd043095a83 100644
--- a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
+++ b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
index d20eaa11b415b..53d32ac007474 100644
--- a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
+++ b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181908_deploy_keys.yml b/config/metrics/counts_all/20210216181908_deploy_keys.yml
index 5d144cdb85531..d600b41825b1c 100644
--- a/config/metrics/counts_all/20210216181908_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216181908_deploy_keys.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181911_successful_deployments.yml b/config/metrics/counts_all/20210216181911_successful_deployments.yml
index d02c5ee2d8b7a..370fc698874af 100644
--- a/config/metrics/counts_all/20210216181911_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181911_successful_deployments.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181912_failed_deployments.yml b/config/metrics/counts_all/20210216181912_failed_deployments.yml
index db7532c9e5bed..bc9a62e676377 100644
--- a/config/metrics/counts_all/20210216181912_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181912_failed_deployments.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181914_environments.yml b/config/metrics/counts_all/20210216181914_environments.yml
index 86958d713b6a7..ebb2eac295532 100644
--- a/config/metrics/counts_all/20210216181914_environments.yml
+++ b/config/metrics/counts_all/20210216181914_environments.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181916_in_review_folder.yml b/config/metrics/counts_all/20210216181916_in_review_folder.yml
index 17cc4f8b730f7..366143b2180fa 100644
--- a/config/metrics/counts_all/20210216181916_in_review_folder.yml
+++ b/config/metrics/counts_all/20210216181916_in_review_folder.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181918_releases.yml b/config/metrics/counts_all/20210216181918_releases.yml
index caf35bd5245d0..1de3aacd29a2e 100644
--- a/config/metrics/counts_all/20210216181918_releases.yml
+++ b/config/metrics/counts_all/20210216181918_releases.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181926_deployments.yml b/config/metrics/counts_all/20210216181926_deployments.yml
index 36d5b11c11560..9ada4d4a44f79 100644
--- a/config/metrics/counts_all/20210216181926_deployments.yml
+++ b/config/metrics/counts_all/20210216181926_deployments.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181928_failed_deployments.yml b/config/metrics/counts_all/20210216181928_failed_deployments.yml
index 36346541dd07d..e3b837457f794 100644
--- a/config/metrics/counts_all/20210216181928_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181928_failed_deployments.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181930_releases.yml b/config/metrics/counts_all/20210216181930_releases.yml
index e14885bd33044..49f199765a960 100644
--- a/config/metrics/counts_all/20210216181930_releases.yml
+++ b/config/metrics/counts_all/20210216181930_releases.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181932_successful_deployments.yml b/config/metrics/counts_all/20210216181932_successful_deployments.yml
index 23dee12d8550b..ec58041b930b7 100644
--- a/config/metrics/counts_all/20210216181932_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181932_successful_deployments.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181946_pages_domains.yml b/config/metrics/counts_all/20210216181946_pages_domains.yml
index 4952ae14614bc..f9739cf260b4e 100644
--- a/config/metrics/counts_all/20210216181946_pages_domains.yml
+++ b/config/metrics/counts_all/20210216181946_pages_domains.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
index 11251ac89c524..5c6db9b551e74 100644
--- a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
@@ -16,4 +16,5 @@ distribution:
 tier:
 - free
 - premium
-- ultimate
\ No newline at end of file
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml b/config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml
index 0d4d7ab0524ad..853c278226d03 100644
--- a/config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml
+++ b/config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182002_remote_mirrors.yml b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
index 8b03e3891f053..842f4128bc3ec 100644
--- a/config/metrics/counts_all/20210216182002_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index 116442201b0ae..7a268d94424e4 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182006_source_code_pushes.yml b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
index 2b36e8e883eff..0bea42fdaa132 100644
--- a/config/metrics/counts_all/20210216182006_source_code_pushes.yml
+++ b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182010_deploy_keys.yml b/config/metrics/counts_all/20210216182010_deploy_keys.yml
index 862b7a46b40d7..1ff5fec9bde1c 100644
--- a/config/metrics/counts_all/20210216182010_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216182010_deploy_keys.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182012_keys.yml b/config/metrics/counts_all/20210216182012_keys.yml
index b1f53628e907d..713e627c4fc82 100644
--- a/config/metrics/counts_all/20210216182012_keys.yml
+++ b/config/metrics/counts_all/20210216182012_keys.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
index 886de35954d20..acc29c0ca376b 100644
--- a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.create.projects_with_disable_overriding_approvers_per_merge_request
-description: Total count of projects that do not allow overriding approvers on discrete merge requests
+description: Total count of projects that do not allow overriding approvers on discrete
+  merge requests
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -17,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
index 96e21c1bdb3dc..e052e906c5fde 100644
--- a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.create.projects_without_disable_overriding_approvers_per_merge_request
-description: Count of total projects that do not disable overriding approvers per discrete merge request
+description: Count of total projects that do not disable overriding approvers per
+  discrete merge request
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -17,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182017_remote_mirrors.yml b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
index 60689e01bcc62..9f7f765895968 100644
--- a/config/metrics/counts_all/20210216182017_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182112_sast_jobs.yml b/config/metrics/counts_all/20210216182112_sast_jobs.yml
index 10e0b0c0532aa..a8218aca536c4 100644
--- a/config/metrics/counts_all/20210216182112_sast_jobs.yml
+++ b/config/metrics/counts_all/20210216182112_sast_jobs.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml b/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml
index b6e603499eb0e..8dd570bee3ea8 100644
--- a/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml
+++ b/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182116_user_sast_jobs.yml b/config/metrics/counts_all/20210216182116_user_sast_jobs.yml
index a79c1ebeb2f4f..6cf41a2199d3e 100644
--- a/config/metrics/counts_all/20210216182116_user_sast_jobs.yml
+++ b/config/metrics/counts_all/20210216182116_user_sast_jobs.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml b/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml
index 7d5f638bf7346..21d2857cbdd70 100644
--- a/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml
+++ b/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
index a07ce8ed1bb6c..977acda773c2c 100644
--- a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
+++ b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
index 02b47c9a2a67a..471cc1bdfc92b 100644
--- a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: counts.projects_datadog_active
-description: 'Count of projects with active integrations for Datadog'
+description: Count of projects with active integrations for Datadog
 product_section: dev
 product_stage: ecosystem
 product_group: group::integrations
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
index 4379dbfba7af7..fffabaa8fc246 100644
--- a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
index b6ad06d9801dd..cd756285214ef 100644
--- a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
index 772639560f4c2..13534dc72b349 100644
--- a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 2badb2dd83f53..1fb65208ac6e2 100644
--- a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 08dd3318dd496..38e18c936356d 100644
--- a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
index 3cdc44868d082..8bd20ccfbb802 100644
--- a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: counts.projects_ewm_active
-description: 'Count of projects with active integrations for EWM'
+description: Count of projects with active integrations for EWM
 product_section: dev
 product_stage: ecosystem
 product_group: group::integrations
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
index 5e1336e59ff23..c81d0cb8b5db2 100644
--- a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
index 8be6bdf0c592a..96a53554b7267 100644
--- a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
index ccc502535c9d1..80585bae5b294 100644
--- a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 8670903142b1a..0fdbe3feb69fa 100644
--- a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 1e8c25751606c..211a6d3d0604c 100644
--- a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 71a6b44ffa853..5c12fa799168b 100644
--- a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 bdfb6260be3bd..eafff875bfb8a 100644
--- a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 a210d3205adcc..b421b3d18431b 100644
--- a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 e0cf0fd30a10a..eb7009db6008e 100644
--- a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 f9e6b6ee4d42f..d2f5d4fe1e342 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
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 3e53603ed9f54..3727a16d08c48 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
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 378114f92943e..59ffe96bc368d 100644
--- a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 231d643bde6b6..2ac5362c37b45 100644
--- a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 3b7659c108ed2..961d787b203fb 100644
--- a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 b82600ae33a14..9f2ece8e9a468 100644
--- a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 71f7ff03adc88..842d4047986d5 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
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 dcbcf74bf5d49..bd8f344bb36c5 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
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 a7917d3ed3e53..d697350af6787 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 543a3a7c0bb01..e6893db2717c5 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 ea346af7322b2..be7486e6b83d1 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 07f4d151a2da9..1011e8bc457f9 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 e9fbb042995d3..f621b86d6acbc 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 668c7668e944d..447d2444f0208 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 f33d1fc32997a..e36411a81e552 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 e1aa7ddc683c3..c9c448b642e6a 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 4d64f5749123e..9ca8e62f68abd 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 e0256f563a8bc..94f9164cd51af 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 61cebf44a7366..7493a8a0cc8a0 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 2fb6e56c49a9c..4fe173115ca34 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 4ab016f854dd0..c2282f4fbddd3 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 45490ab93d69f..a4ec25a635525 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 4c1a0729633b0..2abb34e428e5b 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 e46db03bfaa3d..acfac98b954cd 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 c1ee77426364a..91801bc30658f 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 1a31301c8a5d1..8da5f9d078cde 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 ab3c69f7eed8a..0f0f78db69cab 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 2af3db1ed2c8d..e1f965a829be1 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 ffae5c6efa491..205dea88f01ac 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 babfe6c3507fb..c87529f961491 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 176996e3447d4..d93643d4950ab 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 e589314f06f23..0fbf04f1f5bdb 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 4610a24c51f17..5f51a7a60a29a 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 e540e68355aae..cc1c9021d552a 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 d2af5aa56c8f7..2c4deaf31ceff 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 653fba58565fe..a6671834a79a7 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 82a5509cd034f..25e780687e161 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 5327b10ecf599..e3f0afcb423d0 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 e8b0a0e7fb54a..bbd80491a970b 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 f3484ae5b415e..6582f1593f159 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 183abf834dd96..f3110464d2db1 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.package_events_i_package_pull_package_by_deploy_token
-description: A count of packages that have been downloaded from the package registry using a Deploy Token
+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
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 bad5254aac443..7d80ff712be82 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.package_events_i_package_pull_package_by_guest
-description: A count of packages that have been downloaded from the package registry by a guest
+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
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 f5e450cae7a74..647d9a872fa1b 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.package_events_i_package_pull_package_by_user
-description: A count of packages that have been downloaded from the package registry by a user
+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
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 bbcd3e82234bf..b1a57fb1f17b4 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 3a37af76f738a..2b47a8362152b 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.package_events_i_package_push_package_by_deploy_token
-description: A count of packages that have been published to the package registry using a deploy token
+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
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 2f241519d3d7a..3ae2bdbb2fad6 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.package_events_i_package_push_package_by_guest
-description: A count of packages that have been published to the package registry by a Guest
+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
@@ -17,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 25b3932ad67c5..a6b5c845b46ee 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.package_events_i_package_push_package_by_user
-description: A count of packages that have been published to the package registry by a user
+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
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 2a90a151a539e..6ce565eb9de77 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 0efeac2f9d14e..edccdede86d12 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,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.package_events_i_package_pypi_pull_package
-description: A count of Python packages that have been downloaded from the package registry
+description: A count of Python packages that have been downloaded from the package
+  registry
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 75c91704892d5..da9dc74cbf94c 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
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
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 06217938d8e89..580f06259a1af 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 b96c1866a1747..cb399d23ed13a 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 264a9773f7b55..aa32883e6a5e0 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
index 75403722e5c0c..811277b0b757d 100644
--- a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
+++ b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183400_omniauth_providers.yml b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
index 1f738f7ea73f8..860a4fecec1e9 100644
--- a/config/metrics/counts_all/20210216183400_omniauth_providers.yml
+++ b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183402_two-factor.yml b/config/metrics/counts_all/20210216183402_two-factor.yml
index 623c67195ce50..72f9872d23724 100644
--- a/config/metrics/counts_all/20210216183402_two-factor.yml
+++ b/config/metrics/counts_all/20210216183402_two-factor.yml
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 5bbe08b623cff..2a79190fafaac 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
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
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 adc7569005762..1b0ab9c53d924 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
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183408_standard.yml b/config/metrics/counts_all/20210216183408_standard.yml
index b43bd25031b2f..900a5c205eef9 100644
--- a/config/metrics/counts_all/20210216183408_standard.yml
+++ b/config/metrics/counts_all/20210216183408_standard.yml
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183410_google_oauth2.yml b/config/metrics/counts_all/20210216183410_google_oauth2.yml
index 205b8dadbb031..dbf5b6b180140 100644
--- a/config/metrics/counts_all/20210216183410_google_oauth2.yml
+++ b/config/metrics/counts_all/20210216183410_google_oauth2.yml
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/license/20210204124829_active_user_count.yml b/config/metrics/license/20210204124829_active_user_count.yml
index f8beb5dfd0e46..c3d6b19c6e032 100644
--- a/config/metrics/license/20210204124829_active_user_count.yml
+++ b/config/metrics/license/20210204124829_active_user_count.yml
@@ -7,6 +7,7 @@ product_group: group::product intelligence
 product_category: collection
 value_type: string
 status: data_available
+milestone: "<13.9"
 data_category: subscription
 time_frame: none
 data_source: database
diff --git a/config/metrics/settings/20210201124935_database_adapter.yml b/config/metrics/settings/20210201124935_database_adapter.yml
index 38cdba2a071f4..954807324abc9 100644
--- a/config/metrics/settings/20210201124935_database_adapter.yml
+++ b/config/metrics/settings/20210201124935_database_adapter.yml
@@ -1,7 +1,9 @@
 ---
 data_category: optional
 key_path: database.adapter
-description: This metric only returns a value of PostgreSQL in supported versions of GitLab. It could be removed from the usage ping. Historically MySQL was also supported.
+description: This metric only returns a value of PostgreSQL in supported versions
+  of GitLab. It could be removed from the usage ping. Historically MySQL was also
+  supported.
 product_section: enablement
 product_stage: enablement
 product_group: group::enablement distribution
@@ -18,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
index 8d635cc17a059..8504cf63d5413 100644
--- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index a780b8cfaa937..206e173b24093 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
index d92a3d9b5f9e6..76bb2049c64ea 100644
--- a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
index 552b04675183a..e174a298c90b3 100644
--- a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index 541c7be16e7a9..6d16fdd24fcc6 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
index cabbac5619eb7..e34f2c7b4b084 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
index 0cefe4b595fcf..32ff729366277 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
index 6451a66c87ed0..36812857bce93 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124912_prometheus_enabled.yml b/config/metrics/settings/20210204124912_prometheus_enabled.yml
index 9002751cf6ad7..da33a8a962fd5 100644
--- a/config/metrics/settings/20210204124912_prometheus_enabled.yml
+++ b/config/metrics/settings/20210204124912_prometheus_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
index 04fc99f8dc533..73e9012d4a4ec 100644
--- a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
+++ b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
index 4d4de2da28a2b..ec37ac98dd2e8 100644
--- a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
index 059a3ecba7f07..50ff880364342 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
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 f972622d17643..e028f9ed32742 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124922_grafana_link_enabled.yml b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
index 7822532976316..951df5de64252 100644
--- a/config/metrics/settings/20210204124922_grafana_link_enabled.yml
+++ b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124934_pages_enabled.yml b/config/metrics/settings/20210204124934_pages_enabled.yml
index 7c830e56787b5..287b154600200 100644
--- a/config/metrics/settings/20210204124934_pages_enabled.yml
+++ b/config/metrics/settings/20210204124934_pages_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216174829_smtp_server.yml b/config/metrics/settings/20210216174829_smtp_server.yml
index f82fddbc86cd6..0e96093feaffb 100644
--- a/config/metrics/settings/20210216174829_smtp_server.yml
+++ b/config/metrics/settings/20210216174829_smtp_server.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
index d92815bebfdc2..9bf0277363fd6 100644
--- a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216175604_edition.yml b/config/metrics/settings/20210216175604_edition.yml
index c85378304cc24..4b4f117ccbd36 100644
--- a/config/metrics/settings/20210216175604_edition.yml
+++ b/config/metrics/settings/20210216175604_edition.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
index fb0d3163b3e54..9b7a50a4f1c32 100644
--- a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216175609_version.yml b/config/metrics/settings/20210216175609_version.yml
index 1a8f7af47429d..223238a70fa0d 100644
--- a/config/metrics/settings/20210216175609_version.yml
+++ b/config/metrics/settings/20210216175609_version.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180314_gitpod_enabled.yml b/config/metrics/settings/20210216180314_gitpod_enabled.yml
index 1ade7ee718656..30e082720776e 100644
--- a/config/metrics/settings/20210216180314_gitpod_enabled.yml
+++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180836_enabled.yml b/config/metrics/settings/20210216180836_enabled.yml
index f4f8f721ad12f..35ab202ed5ccf 100644
--- a/config/metrics/settings/20210216180836_enabled.yml
+++ b/config/metrics/settings/20210216180836_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180838_enabled.yml b/config/metrics/settings/20210216180838_enabled.yml
index 03f4f52aaf968..ec1ed88a15dae 100644
--- a/config/metrics/settings/20210216180838_enabled.yml
+++ b/config/metrics/settings/20210216180838_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180840_direct_upload.yml b/config/metrics/settings/20210216180840_direct_upload.yml
index b8b85af94f9a7..89db3c9903394 100644
--- a/config/metrics/settings/20210216180840_direct_upload.yml
+++ b/config/metrics/settings/20210216180840_direct_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180841_background_upload.yml b/config/metrics/settings/20210216180841_background_upload.yml
index d354ad6ff4967..6d3feae4944e9 100644
--- a/config/metrics/settings/20210216180841_background_upload.yml
+++ b/config/metrics/settings/20210216180841_background_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180843_provider.yml b/config/metrics/settings/20210216180843_provider.yml
index 8b94a67dba716..e4967e5e390e4 100644
--- a/config/metrics/settings/20210216180843_provider.yml
+++ b/config/metrics/settings/20210216180843_provider.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180845_enabled.yml b/config/metrics/settings/20210216180845_enabled.yml
index a40aadf701a9a..26abb8f4f2f5f 100644
--- a/config/metrics/settings/20210216180845_enabled.yml
+++ b/config/metrics/settings/20210216180845_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180847_enabled.yml b/config/metrics/settings/20210216180847_enabled.yml
index b1adeac523808..76f352bdbafbd 100644
--- a/config/metrics/settings/20210216180847_enabled.yml
+++ b/config/metrics/settings/20210216180847_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180849_direct_upload.yml b/config/metrics/settings/20210216180849_direct_upload.yml
index a25637270e7f0..cded4304535f5 100644
--- a/config/metrics/settings/20210216180849_direct_upload.yml
+++ b/config/metrics/settings/20210216180849_direct_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180851_background_upload.yml b/config/metrics/settings/20210216180851_background_upload.yml
index 1326c2ebef4df..f2705f52f3a74 100644
--- a/config/metrics/settings/20210216180851_background_upload.yml
+++ b/config/metrics/settings/20210216180851_background_upload.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180852_provider.yml b/config/metrics/settings/20210216180852_provider.yml
index e057a6384a24c..18c0bf6ff0806 100644
--- a/config/metrics/settings/20210216180852_provider.yml
+++ b/config/metrics/settings/20210216180852_provider.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180854_enabled.yml b/config/metrics/settings/20210216180854_enabled.yml
index c129bb028d515..72b228f1c6926 100644
--- a/config/metrics/settings/20210216180854_enabled.yml
+++ b/config/metrics/settings/20210216180854_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180856_enabled.yml b/config/metrics/settings/20210216180856_enabled.yml
index bd26d91a2faa7..0c5abced9b3ad 100644
--- a/config/metrics/settings/20210216180856_enabled.yml
+++ b/config/metrics/settings/20210216180856_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180858_direct_upload.yml b/config/metrics/settings/20210216180858_direct_upload.yml
index 281b6744d35df..3e23f412668d9 100644
--- a/config/metrics/settings/20210216180858_direct_upload.yml
+++ b/config/metrics/settings/20210216180858_direct_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180900_background_upload.yml b/config/metrics/settings/20210216180900_background_upload.yml
index 2e39fa7e379ee..59751ba9fc954 100644
--- a/config/metrics/settings/20210216180900_background_upload.yml
+++ b/config/metrics/settings/20210216180900_background_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180902_provider.yml b/config/metrics/settings/20210216180902_provider.yml
index a8d265f9676ec..16b3a915caf54 100644
--- a/config/metrics/settings/20210216180902_provider.yml
+++ b/config/metrics/settings/20210216180902_provider.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180903_enabled.yml b/config/metrics/settings/20210216180903_enabled.yml
index 00e52b86d866b..7f5abb7880604 100644
--- a/config/metrics/settings/20210216180903_enabled.yml
+++ b/config/metrics/settings/20210216180903_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180905_enabled.yml b/config/metrics/settings/20210216180905_enabled.yml
index dba464bfed35d..8ef51ba21a139 100644
--- a/config/metrics/settings/20210216180905_enabled.yml
+++ b/config/metrics/settings/20210216180905_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180907_direct_upload.yml b/config/metrics/settings/20210216180907_direct_upload.yml
index 93b69a728bc32..e8e59097faf90 100644
--- a/config/metrics/settings/20210216180907_direct_upload.yml
+++ b/config/metrics/settings/20210216180907_direct_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180909_background_upload.yml b/config/metrics/settings/20210216180909_background_upload.yml
index 1af3d227f2f67..e1df69b1e5dc8 100644
--- a/config/metrics/settings/20210216180909_background_upload.yml
+++ b/config/metrics/settings/20210216180909_background_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180911_provider.yml b/config/metrics/settings/20210216180911_provider.yml
index f9f98da356953..4b0455290af0f 100644
--- a/config/metrics/settings/20210216180911_provider.yml
+++ b/config/metrics/settings/20210216180911_provider.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
index 436e5f717c150..63b0b856c8c36 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180915_enabled.yml b/config/metrics/settings/20210216180915_enabled.yml
index b52d85ef8df0b..d9922248b12a3 100644
--- a/config/metrics/settings/20210216180915_enabled.yml
+++ b/config/metrics/settings/20210216180915_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180916_direct_upload.yml b/config/metrics/settings/20210216180916_direct_upload.yml
index 058531516d7c1..f49308e888b7d 100644
--- a/config/metrics/settings/20210216180916_direct_upload.yml
+++ b/config/metrics/settings/20210216180916_direct_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180918_background_upload.yml b/config/metrics/settings/20210216180918_background_upload.yml
index c03e600b6220c..9273c7d4f174a 100644
--- a/config/metrics/settings/20210216180918_background_upload.yml
+++ b/config/metrics/settings/20210216180918_background_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180920_provider.yml b/config/metrics/settings/20210216180920_provider.yml
index bda2c485e3a2d..9a2e52f0f81fd 100644
--- a/config/metrics/settings/20210216180920_provider.yml
+++ b/config/metrics/settings/20210216180920_provider.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216183241_filesystems.yml b/config/metrics/settings/20210216183241_filesystems.yml
index 85f2a736756b8..6609a6c75a7a2 100644
--- a/config/metrics/settings/20210216183241_filesystems.yml
+++ b/config/metrics/settings/20210216183241_filesystems.yml
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216183248_pg_system_id.yml b/config/metrics/settings/20210216183248_pg_system_id.yml
index 5883473a003bf..7432c7fc1eb05 100644
--- a/config/metrics/settings/20210216183248_pg_system_id.yml
+++ b/config/metrics/settings/20210216183248_pg_system_id.yml
@@ -5,7 +5,7 @@ description: TBD
 product_section: enablement
 product_stage: enablement
 product_group: group::distribution
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml b/ee/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
index a8833610a2e8c..518191a405a36 100644
--- a/ee/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /groups/:group/-/contribution_analytics by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_contribution
+  - g_analytics_contribution
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml b/ee/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
index b467bb078eb6b..2ee7e87cb084a 100644
--- a/ee/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /groups/:group/-/insights/ by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_insights
+  - g_analytics_insights
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml b/ee/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
index d98064fafa0e2..e0a4d252702e9 100644
--- a/ee/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /groups/:group/-/issues_analytics by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_issues
+  - g_analytics_issues
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml b/ee/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
index 3815bc9380b5b..3ad3f7bbdb880 100644
--- a/ee/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
@@ -6,7 +6,7 @@ description: Unique visitors to /groups/:group/-/analytics/productivity_analytic
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -14,10 +14,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_productivity
+  - g_analytics_productivity
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml b/ee/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
index c2e20f2cf9d5d..a880587717529 100644
--- a/ee/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
@@ -6,7 +6,7 @@ description: Unique visitors to /groups/:group/-/analytics/value_stream_analytic
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -14,10 +14,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_valuestream
+  - g_analytics_valuestream
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml b/ee/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
index 4247b9d71fdaf..e31994b4f99cd 100644
--- a/ee/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/-/analytics/code_reviews by mon
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_code_reviews
+  - p_analytics_code_reviews
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml b/ee/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
index 08115e3537e63..43692b40c501b 100644
--- a/ee/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/insights/ by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_insights
+  - p_analytics_insights
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml b/ee/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
index 2353a0988fa7f..5472399decb9a 100644
--- a/ee/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/-/analytics/issues_analytics by
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_issues
+  - p_analytics_issues
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml b/ee/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
index 4521fd0bd7fef..f71d8d8cc8cb0 100644
--- a/ee/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/-/graphs/master/charts by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_repo
+  - p_analytics_repo
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml b/ee/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
index 57e254eb2f761..be55399e3d5d5 100644
--- a/ee/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
@@ -6,7 +6,7 @@ description: Unique visitors to /:group/:project/-/analytics/merge_request_analy
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -14,10 +14,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_merge_request
+  - p_analytics_merge_request
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175103_merge_requests_with_added_rules.yml b/ee/config/metrics/counts_28d/20210216175103_merge_requests_with_added_rules.yml
index 7dccbe4955b11..d788ce185451c 100644
--- a/ee/config/metrics/counts_28d/20210216175103_merge_requests_with_added_rules.yml
+++ b/ee/config/metrics/counts_28d/20210216175103_merge_requests_with_added_rules.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175105_merge_requests_with_optional_codeowners.yml b/ee/config/metrics/counts_28d/20210216175105_merge_requests_with_optional_codeowners.yml
index 9b062628466b8..de0b508066f91 100644
--- a/ee/config/metrics/counts_28d/20210216175105_merge_requests_with_optional_codeowners.yml
+++ b/ee/config/metrics/counts_28d/20210216175105_merge_requests_with_optional_codeowners.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175107_merge_requests_with_required_codeowners.yml b/ee/config/metrics/counts_28d/20210216175107_merge_requests_with_required_codeowners.yml
index 7ba46ad410d62..7aba691f7babe 100644
--- a/ee/config/metrics/counts_28d/20210216175107_merge_requests_with_required_codeowners.yml
+++ b/ee/config/metrics/counts_28d/20210216175107_merge_requests_with_required_codeowners.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_jobs.yml b/ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_jobs.yml
index 5c7f5bd8ac8df..1d5d771c7a612 100644
--- a/ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_jobs.yml
@@ -17,3 +17,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175224_user_license_management_jobs.yml b/ee/config/metrics/counts_28d/20210216175224_user_license_management_jobs.yml
index 67a6c537000b0..7689ed1b19123 100644
--- a/ee/config/metrics/counts_28d/20210216175224_user_license_management_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216175224_user_license_management_jobs.yml
@@ -17,3 +17,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.yml b/ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.yml
index 2a5f1c2e26dbd..efcf36b6d38fc 100644
--- a/ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175436_projects_slack_notifications_active.yml b/ee/config/metrics/counts_28d/20210216175436_projects_slack_notifications_active.yml
index 23a50e2f69252..1a790310fced7 100644
--- a/ee/config/metrics/counts_28d/20210216175436_projects_slack_notifications_active.yml
+++ b/ee/config/metrics/counts_28d/20210216175436_projects_slack_notifications_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175437_projects_slack_slash_active.yml b/ee/config/metrics/counts_28d/20210216175437_projects_slack_slash_active.yml
index 61fd227b6d8dc..7c2cf966bbdc5 100644
--- a/ee/config/metrics/counts_28d/20210216175437_projects_slack_slash_active.yml
+++ b/ee/config/metrics/counts_28d/20210216175437_projects_slack_slash_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml b/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml
index b8af678dd3145..c95268f3b371e 100644
--- a/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml
@@ -18,3 +18,4 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175507_container_scanning_pipeline.yml b/ee/config/metrics/counts_28d/20210216175507_container_scanning_pipeline.yml
index 5262a0067cd1d..0425176d1bc54 100644
--- a/ee/config/metrics/counts_28d/20210216175507_container_scanning_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216175507_container_scanning_pipeline.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175558_projects_reporting_ci_cd_back_to_github.yml b/ee/config/metrics/counts_28d/20210216175558_projects_reporting_ci_cd_back_to_github.yml
index 64a25d5d6ca55..f28bf5431b77b 100644
--- a/ee/config/metrics/counts_28d/20210216175558_projects_reporting_ci_cd_back_to_github.yml
+++ b/ee/config/metrics/counts_28d/20210216175558_projects_reporting_ci_cd_back_to_github.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml b/ee/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
index e0ecb5d697490..768bcaf971c76 100644
--- a/ee/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
@@ -17,3 +17,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175618_dast_pipeline.yml b/ee/config/metrics/counts_28d/20210216175618_dast_pipeline.yml
index 509b88a81d64a..7bb32c8a47ceb 100644
--- a/ee/config/metrics/counts_28d/20210216175618_dast_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216175618_dast_pipeline.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml b/ee/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
index 303a00a7c3421..2a987292466ca 100644
--- a/ee/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml b/ee/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml
index 53f4eebc5c179..ce80493419c89 100644
--- a/ee/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml
@@ -14,3 +14,4 @@ distribution:
 - ee
 tier:
 - ultimate
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180359_coverage_fuzzing_pipeline.yml b/ee/config/metrics/counts_28d/20210216180359_coverage_fuzzing_pipeline.yml
index c4a5d8b3c91ee..af78902e84721 100644
--- a/ee/config/metrics/counts_28d/20210216180359_coverage_fuzzing_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216180359_coverage_fuzzing_pipeline.yml
@@ -16,3 +16,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.yml b/ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.yml
index fceefd1a56af0..775f55fc45606 100644
--- a/ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180427_i_search_advanced_monthly.yml b/ee/config/metrics/counts_28d/20210216180427_i_search_advanced_monthly.yml
index 41069adbc4415..08c22565dcacc 100644
--- a/ee/config/metrics/counts_28d/20210216180427_i_search_advanced_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216180427_i_search_advanced_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml b/ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml
index 4882f45b4e002..c635c71776ea3 100644
--- a/ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users that published incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180820_ldap_keys.yml b/ee/config/metrics/counts_28d/20210216180820_ldap_keys.yml
index 99072393c5aaf..9e51f5302572a 100644
--- a/ee/config/metrics/counts_28d/20210216180820_ldap_keys.yml
+++ b/ee/config/metrics/counts_28d/20210216180820_ldap_keys.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180822_ldap_users.yml b/ee/config/metrics/counts_28d/20210216180822_ldap_users.yml
index 6abc16400ce67..968fa8b701cec 100644
--- a/ee/config/metrics/counts_28d/20210216180822_ldap_users.yml
+++ b/ee/config/metrics/counts_28d/20210216180822_ldap_users.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180824_value_stream_management_customized_group_stages.yml b/ee/config/metrics/counts_28d/20210216180824_value_stream_management_customized_group_stages.yml
index 008ae9bce6763..5157a158b551a 100644
--- a/ee/config/metrics/counts_28d/20210216180824_value_stream_management_customized_group_stages.yml
+++ b/ee/config/metrics/counts_28d/20210216180824_value_stream_management_customized_group_stages.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.value_stream_management_customized_group_stages
-description: 
+description:
 product_section: dev
-product_stage: 
+product_stage:
 product_group: group::manage
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -17,3 +17,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180825_projects_with_compliance_framework.yml b/ee/config/metrics/counts_28d/20210216180825_projects_with_compliance_framework.yml
index 054797c3b26de..63b75abeac7b2 100644
--- a/ee/config/metrics/counts_28d/20210216180825_projects_with_compliance_framework.yml
+++ b/ee/config/metrics/counts_28d/20210216180825_projects_with_compliance_framework.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180827_ldap_servers.yml b/ee/config/metrics/counts_28d/20210216180827_ldap_servers.yml
index 9f4f11ffa48e9..337247594bbb2 100644
--- a/ee/config/metrics/counts_28d/20210216180827_ldap_servers.yml
+++ b/ee/config/metrics/counts_28d/20210216180827_ldap_servers.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181156_assignee_lists.yml b/ee/config/metrics/counts_28d/20210216181156_assignee_lists.yml
index 4bbfb8259d223..28584f71ec918 100644
--- a/ee/config/metrics/counts_28d/20210216181156_assignee_lists.yml
+++ b/ee/config/metrics/counts_28d/20210216181156_assignee_lists.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181201_milestone_lists.yml b/ee/config/metrics/counts_28d/20210216181201_milestone_lists.yml
index d84961a1414f1..6176b4215266b 100644
--- a/ee/config/metrics/counts_28d/20210216181201_milestone_lists.yml
+++ b/ee/config/metrics/counts_28d/20210216181201_milestone_lists.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml b/ee/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml
index 9fb32072133a8..4135c8841d5d7 100644
--- a/ee/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml b/ee/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml
index 5ff7c55021ccd..eae4a350ea97d 100644
--- a/ee/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml
index edc2656649628..e580bc7a4c29b 100644
--- a/ee/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml
index 76a1950b79b11..42a04f59f644d 100644
--- a/ee/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml
index 73a5428f4677d..a4b9b36e7ffe0 100644
--- a/ee/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml b/ee/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml
index 6fb62b17319c3..a6d9fdc7f5dc5 100644
--- a/ee/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml b/ee/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
index 5c4cd313b295d..cb155353e76f7 100644
--- a/ee/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml
index 6035bbf07e886..57bf1ff9e28d1 100644
--- a/ee/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml b/ee/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml
index 0a46150d60d00..09a53b1cf71a7 100644
--- a/ee/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml
index ac87bfdf92cfc..b798edc7927da 100644
--- a/ee/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml b/ee/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml
index 3cd6ed2c741f9..337ae9169cf31 100644
--- a/ee/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml
index 44d56688a6d9e..8ac4feff36157 100644
--- a/ee/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml b/ee/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml
index 9059e6ae9242c..ab77533293370 100644
--- a/ee/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml b/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
index 46056953f81ab..132ef3310d736 100644
--- a/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml
index 80be9f595538f..de97d4574cf39 100644
--- a/ee/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml
index 8a39719e8ac9b..43492087e95cf 100644
--- a/ee/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml b/ee/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml
index 39808f364bc9e..12a8075bd1308 100644
--- a/ee/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml
index e47e52b1cc33d..baefef40abfa5 100644
--- a/ee/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml b/ee/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml
index 268ba4ddf2718..7967eeb5103c3 100644
--- a/ee/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml b/ee/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml
index f06dbe3bd6a1f..b3577995f005a 100644
--- a/ee/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml
+++ b/ee/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml
@@ -5,7 +5,7 @@ description: Count creator_id from projects with repository mirroring enabled.
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml b/ee/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml
index f48831106ad69..808fdd0ca30ad 100644
--- a/ee/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml
+++ b/ee/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml b/ee/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
index ea9a1bfc7452d..bda0b82a8deb5 100644
--- a/ee/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
+++ b/ee/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182047_merge_requests_with_overridden_project_rules.yml b/ee/config/metrics/counts_28d/20210216182047_merge_requests_with_overridden_project_rules.yml
index 9323c89880905..d424f23ccc916 100644
--- a/ee/config/metrics/counts_28d/20210216182047_merge_requests_with_overridden_project_rules.yml
+++ b/ee/config/metrics/counts_28d/20210216182047_merge_requests_with_overridden_project_rules.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml b/ee/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
index dda3f2f59f9be..a609faeb50fd2 100644
--- a/ee/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
+++ b/ee/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182053_users_using_path_locks.yml b/ee/config/metrics/counts_28d/20210216182053_users_using_path_locks.yml
index 7554ddf0ec774..f010bb12c5f9c 100644
--- a/ee/config/metrics/counts_28d/20210216182053_users_using_path_locks.yml
+++ b/ee/config/metrics/counts_28d/20210216182053_users_using_path_locks.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182054_users_using_lfs_locks.yml b/ee/config/metrics/counts_28d/20210216182054_users_using_lfs_locks.yml
index efeb8e889369b..bb98bab68c79c 100644
--- a/ee/config/metrics/counts_28d/20210216182054_users_using_lfs_locks.yml
+++ b/ee/config/metrics/counts_28d/20210216182054_users_using_lfs_locks.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182056_approval_project_rules.yml b/ee/config/metrics/counts_28d/20210216182056_approval_project_rules.yml
index 6943d48f36eef..8d721f24821ef 100644
--- a/ee/config/metrics/counts_28d/20210216182056_approval_project_rules.yml
+++ b/ee/config/metrics/counts_28d/20210216182056_approval_project_rules.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182058_approval_project_rules_with_target_branch.yml b/ee/config/metrics/counts_28d/20210216182058_approval_project_rules_with_target_branch.yml
index 8b713b91aa99c..497516a481004 100644
--- a/ee/config/metrics/counts_28d/20210216182058_approval_project_rules_with_target_branch.yml
+++ b/ee/config/metrics/counts_28d/20210216182058_approval_project_rules_with_target_branch.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182139_i_testing_metrics_report_widget_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182139_i_testing_metrics_report_widget_total_monthly.yml
index 62a2f221f80e8..7a053c22888b4 100644
--- a/ee/config/metrics/counts_28d/20210216182139_i_testing_metrics_report_widget_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182139_i_testing_metrics_report_widget_total_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182143_i_testing_group_code_coverage_visit_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182143_i_testing_group_code_coverage_visit_total_monthly.yml
index 2a2e945f0f2f9..4f796487fee1f 100644
--- a/ee/config/metrics/counts_28d/20210216182143_i_testing_group_code_coverage_visit_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182143_i_testing_group_code_coverage_visit_total_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182147_i_testing_full_code_quality_report_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182147_i_testing_full_code_quality_report_total_monthly.yml
index e43f1a5363142..4595701e1f1ad 100644
--- a/ee/config/metrics/counts_28d/20210216182147_i_testing_full_code_quality_report_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182147_i_testing_full_code_quality_report_total_monthly.yml
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182151_i_testing_web_performance_widget_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182151_i_testing_web_performance_widget_total_monthly.yml
index da746a2906d51..6e951aa0e5037 100644
--- a/ee/config/metrics/counts_28d/20210216182151_i_testing_web_performance_widget_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182151_i_testing_web_performance_widget_total_monthly.yml
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182153_i_testing_group_code_coverage_project_click_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182153_i_testing_group_code_coverage_project_click_total_monthly.yml
index c791a42b37ac4..a5c4d213eed9d 100644
--- a/ee/config/metrics/counts_28d/20210216182153_i_testing_group_code_coverage_project_click_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182153_i_testing_group_code_coverage_project_click_total_monthly.yml
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182156_i_testing_load_performance_widget_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182156_i_testing_load_performance_widget_total_monthly.yml
index 4563c2df649ec..958451b69cc95 100644
--- a/ee/config/metrics/counts_28d/20210216182156_i_testing_load_performance_widget_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182156_i_testing_load_performance_widget_total_monthly.yml
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml b/ee/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml
index e9bc9a99a1dee..1b6abc4bce62c 100644
--- a/ee/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182209_user_preferences_group_overview_security_dashboard.yml b/ee/config/metrics/counts_28d/20210216182209_user_preferences_group_overview_security_dashboard.yml
index 6625d9f79efe5..7c2754d17b190 100644
--- a/ee/config/metrics/counts_28d/20210216182209_user_preferences_group_overview_security_dashboard.yml
+++ b/ee/config/metrics/counts_28d/20210216182209_user_preferences_group_overview_security_dashboard.yml
@@ -16,3 +16,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml b/ee/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml
index 7f0230bfe5199..2bd9edd4716ae 100644
--- a/ee/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml
+++ b/ee/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml b/ee/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
index 4f175c69636d6..63cbffd46b9d9 100644
--- a/ee/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
+++ b/ee/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
@@ -18,3 +18,4 @@ tier:
 - ultimate
 performance_indicator_type:
 - paid_gmau
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml b/ee/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
index 6afd203bb6ef7..811f8c5b5a26d 100644
--- a/ee/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
+++ b/ee/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml b/ee/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
index 51798aaea559b..c2e49e521a033 100644
--- a/ee/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
+++ b/ee/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml b/ee/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml
index 6af7c91799ac9..5ff3195f83ecc 100644
--- a/ee/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml
+++ b/ee/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml b/ee/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml
index 2c4fada97a468..5c517d556e396 100644
--- a/ee/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml
+++ b/ee/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml b/ee/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml
index b0e68831e701a..583237296651e 100644
--- a/ee/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml
+++ b/ee/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml b/ee/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
index f558fcc9165ab..9c21f314f1a73 100644
--- a/ee/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
@@ -17,3 +17,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml b/ee/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml
index cf4fb210122da..1098b2bb42036 100644
--- a/ee/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml
+++ b/ee/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183832_dast_scans.yml b/ee/config/metrics/counts_28d/20210216183832_dast_scans.yml
index 3d65cebd79d27..ece7d711078dc 100644
--- a/ee/config/metrics/counts_28d/20210216183832_dast_scans.yml
+++ b/ee/config/metrics/counts_28d/20210216183832_dast_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml b/ee/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml
index 06d470fa6c669..32b6c9b56cb58 100644
--- a/ee/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml
+++ b/ee/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml b/ee/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml
index acd2945583c6c..4b64bf51cc37b 100644
--- a/ee/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml
+++ b/ee/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml b/ee/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml
index 65fb7684830ee..e730825e2294d 100644
--- a/ee/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183926_g_compliance_dashboard_monthly.yml b/ee/config/metrics/counts_28d/20210216183926_g_compliance_dashboard_monthly.yml
index 3c0cd76cc5b39..1d8459d6d598a 100644
--- a/ee/config/metrics/counts_28d/20210216183926_g_compliance_dashboard_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216183926_g_compliance_dashboard_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml b/ee/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml
index c270edbb987dc..a7fe0de1f9f44 100644
--- a/ee/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml b/ee/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml
index 31c8496d7bf25..885d8486fed57 100644
--- a/ee/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_monthly.yml b/ee/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_monthly.yml
index d49773f0c7e73..66d93e6547648 100644
--- a/ee/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_monthly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml b/ee/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml
index d8877af4a091d..84394a5f41556 100644
--- a/ee/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml b/ee/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml
index bfd1467859aca..bc84e6ea6d05c 100644
--- a/ee/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml
@@ -26,3 +26,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml b/ee/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml
index e85349bb23dc7..b7f808bab1f43 100644
--- a/ee/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml b/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
index a43392e5adb0e..4053b6b48c0c7 100644
--- a/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_list_issues
+  - i_ecosystem_jira_service_list_issues
 distribution:
 - ee
 tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml b/ee/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
index fe3af1b44fe8d..ae74211bd75b4 100644
--- a/ee/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_create_issue
+  - i_ecosystem_jira_service_create_issue
 distribution:
 - ee
 tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174912_g_analytics_contribution_weekly.yml b/ee/config/metrics/counts_7d/20210216174912_g_analytics_contribution_weekly.yml
index 0fe12ff590ad3..01a034b567393 100644
--- a/ee/config/metrics/counts_7d/20210216174912_g_analytics_contribution_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174912_g_analytics_contribution_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /groups/:group/-/contribution_analytics by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_contribution
+  - g_analytics_contribution
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174916_g_analytics_insights_weekly.yml b/ee/config/metrics/counts_7d/20210216174916_g_analytics_insights_weekly.yml
index b8710cf99f636..093a21826f49a 100644
--- a/ee/config/metrics/counts_7d/20210216174916_g_analytics_insights_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174916_g_analytics_insights_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /groups/:group/-/insights/ by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_insights
+  - g_analytics_insights
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174919_g_analytics_issues_weekly.yml b/ee/config/metrics/counts_7d/20210216174919_g_analytics_issues_weekly.yml
index 0eb17fe0ba54e..1c133df3a5ba0 100644
--- a/ee/config/metrics/counts_7d/20210216174919_g_analytics_issues_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174919_g_analytics_issues_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /groups/:group/-/issues_analytics by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_issues
+  - g_analytics_issues
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174923_g_analytics_productivity_weekly.yml b/ee/config/metrics/counts_7d/20210216174923_g_analytics_productivity_weekly.yml
index e8e1ed1000748..0d14cb085c816 100644
--- a/ee/config/metrics/counts_7d/20210216174923_g_analytics_productivity_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174923_g_analytics_productivity_weekly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.analytics.g_analytics_productivity_weekly
-description: Unique visitors to /groups/:group/-/analytics/productivity_analytics by week
+description: Unique visitors to /groups/:group/-/analytics/productivity_analytics
+  by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +14,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_productivity
+  - g_analytics_productivity
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174927_g_analytics_valuestream_weekly.yml b/ee/config/metrics/counts_7d/20210216174927_g_analytics_valuestream_weekly.yml
index 1d896afa80640..8f043d5ffc386 100644
--- a/ee/config/metrics/counts_7d/20210216174927_g_analytics_valuestream_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174927_g_analytics_valuestream_weekly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.analytics.g_analytics_valuestream_weekly
-description: Unique visitors to /groups/:group/-/analytics/value_stream_analytics by week
+description: Unique visitors to /groups/:group/-/analytics/value_stream_analytics
+  by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +14,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_valuestream
+  - g_analytics_valuestream
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174931_p_analytics_pipelines_weekly.yml b/ee/config/metrics/counts_7d/20210216174931_p_analytics_pipelines_weekly.yml
index 323c6c8574647..42ded54980b64 100644
--- a/ee/config/metrics/counts_7d/20210216174931_p_analytics_pipelines_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174931_p_analytics_pipelines_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /groups/:group/-/analytics/ci_cd by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_pipelines
+  - p_analytics_pipelines
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174935_p_analytics_code_reviews_weekly.yml b/ee/config/metrics/counts_7d/20210216174935_p_analytics_code_reviews_weekly.yml
index ebb29a0515558..28b6e283f196e 100644
--- a/ee/config/metrics/counts_7d/20210216174935_p_analytics_code_reviews_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174935_p_analytics_code_reviews_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/-/analytics/code_reviews by wee
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_code_reviews
+  - p_analytics_code_reviews
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174939_p_analytics_valuestream_weekly.yml b/ee/config/metrics/counts_7d/20210216174939_p_analytics_valuestream_weekly.yml
index af84d79e958a2..0416605b31aea 100644
--- a/ee/config/metrics/counts_7d/20210216174939_p_analytics_valuestream_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174939_p_analytics_valuestream_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/-/value_stream_analytics by wee
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_valuestream
+  - p_analytics_valuestream
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174943_p_analytics_insights_weekly.yml b/ee/config/metrics/counts_7d/20210216174943_p_analytics_insights_weekly.yml
index ceb830f003cb1..02fd3d1f1ea17 100644
--- a/ee/config/metrics/counts_7d/20210216174943_p_analytics_insights_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174943_p_analytics_insights_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/insights/ by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_insights
+  - p_analytics_insights
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174947_p_analytics_issues_weekly.yml b/ee/config/metrics/counts_7d/20210216174947_p_analytics_issues_weekly.yml
index 3735f225e3b8b..9b3adea7ee9e3 100644
--- a/ee/config/metrics/counts_7d/20210216174947_p_analytics_issues_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174947_p_analytics_issues_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/-/analytics/issues_analytics by
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_issues
+  - p_analytics_issues
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174951_p_analytics_repo_weekly.yml b/ee/config/metrics/counts_7d/20210216174951_p_analytics_repo_weekly.yml
index b1cd418b9e78a..a0de4b49fc60e 100644
--- a/ee/config/metrics/counts_7d/20210216174951_p_analytics_repo_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174951_p_analytics_repo_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/-/graphs/master/charts by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_repo
+  - p_analytics_repo
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174955_i_analytics_cohorts_weekly.yml b/ee/config/metrics/counts_7d/20210216174955_i_analytics_cohorts_weekly.yml
index b4fa4946fc648..e6cdc6d2663f9 100644
--- a/ee/config/metrics/counts_7d/20210216174955_i_analytics_cohorts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174955_i_analytics_cohorts_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.analytics.i_analytics_cohorts_weekly
-description: 
+description:
 product_section: fulfillment
 product_stage: fulfillment
 product_group: group::utilization
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_analytics_cohorts
+  - i_analytics_cohorts
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174958_i_analytics_dev_ops_score_weekly.yml b/ee/config/metrics/counts_7d/20210216174958_i_analytics_dev_ops_score_weekly.yml
index 12234d3f77921..d42a46ac40297 100644
--- a/ee/config/metrics/counts_7d/20210216174958_i_analytics_dev_ops_score_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174958_i_analytics_dev_ops_score_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /admin/dev_ops_report by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_analytics_dev_ops_score
+  - i_analytics_dev_ops_score
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216175002_g_analytics_merge_request_weekly.yml b/ee/config/metrics/counts_7d/20210216175002_g_analytics_merge_request_weekly.yml
index a27b2109ab644..4ad56e56efad0 100644
--- a/ee/config/metrics/counts_7d/20210216175002_g_analytics_merge_request_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216175002_g_analytics_merge_request_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.analytics.g_analytics_merge_request_weekly
-description: 
+description:
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: removed
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_merge_request
+  - g_analytics_merge_request
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216175006_p_analytics_merge_request_weekly.yml b/ee/config/metrics/counts_7d/20210216175006_p_analytics_merge_request_weekly.yml
index 96632bf3cea64..391c2700ecbe1 100644
--- a/ee/config/metrics/counts_7d/20210216175006_p_analytics_merge_request_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216175006_p_analytics_merge_request_weekly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.analytics.p_analytics_merge_request_weekly
-description: Unique visitors to /:group/:project/-/analytics/merge_request_analytics by week
+description: Unique visitors to /:group/:project/-/analytics/merge_request_analytics
+  by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +14,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_merge_request
+  - p_analytics_merge_request
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216180425_i_search_advanced_weekly.yml b/ee/config/metrics/counts_7d/20210216180425_i_search_advanced_weekly.yml
index 9cef8476e935e..a96f3d61ffb78 100644
--- a/ee/config/metrics/counts_7d/20210216180425_i_search_advanced_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216180425_i_search_advanced_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml b/ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml
index 3eac7c750fd6a..3474783fbfd63 100644
--- a/ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users that published incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181339_g_project_management_issue_iteration_changed_weekly.yml b/ee/config/metrics/counts_7d/20210216181339_g_project_management_issue_iteration_changed_weekly.yml
index 0fc0892c60f23..0bd568b2a2536 100644
--- a/ee/config/metrics/counts_7d/20210216181339_g_project_management_issue_iteration_changed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181339_g_project_management_issue_iteration_changed_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181343_g_project_management_issue_weight_changed_weekly.yml b/ee/config/metrics/counts_7d/20210216181343_g_project_management_issue_weight_changed_weekly.yml
index 6da7314c1c26d..b706901015df2 100644
--- a/ee/config/metrics/counts_7d/20210216181343_g_project_management_issue_weight_changed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181343_g_project_management_issue_weight_changed_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181413_g_project_management_issue_added_to_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181413_g_project_management_issue_added_to_epic_weekly.yml
index b4dea244d964b..a05b7df29c9bb 100644
--- a/ee/config/metrics/counts_7d/20210216181413_g_project_management_issue_added_to_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181413_g_project_management_issue_added_to_epic_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181418_g_project_management_issue_changed_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181418_g_project_management_issue_changed_epic_weekly.yml
index 4cedb3f599e45..9ee07ae349392 100644
--- a/ee/config/metrics/counts_7d/20210216181418_g_project_management_issue_changed_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181418_g_project_management_issue_changed_epic_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181455_g_project_management_issue_health_status_changed_weekly.yml b/ee/config/metrics/counts_7d/20210216181455_g_project_management_issue_health_status_changed_weekly.yml
index fca8ea5d53d8d..c3fd557418bd4 100644
--- a/ee/config/metrics/counts_7d/20210216181455_g_project_management_issue_health_status_changed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181455_g_project_management_issue_health_status_changed_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml b/ee/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
index 4cc2e684dd0e9..3d864366b9a2a 100644
--- a/ee/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181532_i_quickactions_child_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181532_i_quickactions_child_epic_weekly.yml
index e20086aed5aff..ce8c36a266d53 100644
--- a/ee/config/metrics/counts_7d/20210216181532_i_quickactions_child_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181532_i_quickactions_child_epic_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181536_i_quickactions_clear_weight_weekly.yml b/ee/config/metrics/counts_7d/20210216181536_i_quickactions_clear_weight_weekly.yml
index 79a0df5e4e875..e8d78ffbe341b 100644
--- a/ee/config/metrics/counts_7d/20210216181536_i_quickactions_clear_weight_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181536_i_quickactions_clear_weight_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181617_i_quickactions_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181617_i_quickactions_epic_weekly.yml
index ef79d9cf0650a..83845ba247cb6 100644
--- a/ee/config/metrics/counts_7d/20210216181617_i_quickactions_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181617_i_quickactions_epic_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181624_i_quickactions_iteration_weekly.yml b/ee/config/metrics/counts_7d/20210216181624_i_quickactions_iteration_weekly.yml
index 69bce7cb132ec..8cf1487985310 100644
--- a/ee/config/metrics/counts_7d/20210216181624_i_quickactions_iteration_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181624_i_quickactions_iteration_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181646_i_quickactions_parent_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181646_i_quickactions_parent_epic_weekly.yml
index e05eb21b91f34..92907d48820de 100644
--- a/ee/config/metrics/counts_7d/20210216181646_i_quickactions_parent_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181646_i_quickactions_parent_epic_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181650_i_quickactions_promote_weekly.yml b/ee/config/metrics/counts_7d/20210216181650_i_quickactions_promote_weekly.yml
index 7fb4fb6c3b0b1..d93801c4f75c6 100644
--- a/ee/config/metrics/counts_7d/20210216181650_i_quickactions_promote_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181650_i_quickactions_promote_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml b/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml
index bea34880817ab..cc5165556680c 100644
--- a/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181716_i_quickactions_remove_child_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181716_i_quickactions_remove_child_epic_weekly.yml
index a6e24f708d47b..414d3ce0b7709 100644
--- a/ee/config/metrics/counts_7d/20210216181716_i_quickactions_remove_child_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181716_i_quickactions_remove_child_epic_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181723_i_quickactions_remove_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181723_i_quickactions_remove_epic_weekly.yml
index 16c17282def1b..ed4784d1c4136 100644
--- a/ee/config/metrics/counts_7d/20210216181723_i_quickactions_remove_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181723_i_quickactions_remove_epic_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181731_i_quickactions_remove_iteration_weekly.yml b/ee/config/metrics/counts_7d/20210216181731_i_quickactions_remove_iteration_weekly.yml
index 821f9830efab8..09abfe34eeb6e 100644
--- a/ee/config/metrics/counts_7d/20210216181731_i_quickactions_remove_iteration_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181731_i_quickactions_remove_iteration_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181738_i_quickactions_remove_parent_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181738_i_quickactions_remove_parent_epic_weekly.yml
index d94cd38b0a4cf..5840f7b8dbccb 100644
--- a/ee/config/metrics/counts_7d/20210216181738_i_quickactions_remove_parent_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181738_i_quickactions_remove_parent_epic_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181856_i_quickactions_weight_weekly.yml b/ee/config/metrics/counts_7d/20210216181856_i_quickactions_weight_weekly.yml
index afad5a3316603..ed639f3d54475 100644
--- a/ee/config/metrics/counts_7d/20210216181856_i_quickactions_weight_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181856_i_quickactions_weight_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216182138_i_testing_metrics_report_widget_total_weekly.yml b/ee/config/metrics/counts_7d/20210216182138_i_testing_metrics_report_widget_total_weekly.yml
index bc7520430e1ca..693db5c2bfac2 100644
--- a/ee/config/metrics/counts_7d/20210216182138_i_testing_metrics_report_widget_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182138_i_testing_metrics_report_widget_total_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216182141_i_testing_group_code_coverage_visit_total_weekly.yml b/ee/config/metrics/counts_7d/20210216182141_i_testing_group_code_coverage_visit_total_weekly.yml
index a7489ffb08088..50d356caf1264 100644
--- a/ee/config/metrics/counts_7d/20210216182141_i_testing_group_code_coverage_visit_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182141_i_testing_group_code_coverage_visit_total_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216182145_i_testing_full_code_quality_report_total_weekly.yml b/ee/config/metrics/counts_7d/20210216182145_i_testing_full_code_quality_report_total_weekly.yml
index 02a85f0b9c64e..7174dd13a459c 100644
--- a/ee/config/metrics/counts_7d/20210216182145_i_testing_full_code_quality_report_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182145_i_testing_full_code_quality_report_total_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216182149_i_testing_web_performance_widget_total_weekly.yml b/ee/config/metrics/counts_7d/20210216182149_i_testing_web_performance_widget_total_weekly.yml
index b02108482fc45..682ec1a9319a1 100644
--- a/ee/config/metrics/counts_7d/20210216182149_i_testing_web_performance_widget_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182149_i_testing_web_performance_widget_total_weekly.yml
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216182154_i_testing_load_performance_widget_total_weekly.yml b/ee/config/metrics/counts_7d/20210216182154_i_testing_load_performance_widget_total_weekly.yml
index 581040b447317..deed1facde7c1 100644
--- a/ee/config/metrics/counts_7d/20210216182154_i_testing_load_performance_widget_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182154_i_testing_load_performance_widget_total_weekly.yml
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml b/ee/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml
index f05f1b2976856..bc7c39e4cae91 100644
--- a/ee/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.testing.i_testing_metrics_report_artifact_uploaders_weekly
-description: Count of unique users per week who trigger a pipeline that uploads a metrics report.
+description: Count of unique users per week who trigger a pipeline that uploads a
+  metrics report.
 product_section: ops
 product_stage: verify
 product_group: group::testing
@@ -20,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183211_compliance_features_track_unique_visits_union.yml b/ee/config/metrics/counts_7d/20210216183211_compliance_features_track_unique_visits_union.yml
index 084a445b181ab..7380041b67a45 100644
--- a/ee/config/metrics/counts_7d/20210216183211_compliance_features_track_unique_visits_union.yml
+++ b/ee/config/metrics/counts_7d/20210216183211_compliance_features_track_unique_visits_union.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: counts_weekly.aggregated_metrics.compliance_features_track_unique_visits_union
-description: 'Unique users that have used audit event screen, audit event API, compliance report, or credential inventory'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'compliance_management'
+description: Unique users that have used audit event screen, audit event API, compliance
+  report, or credential inventory
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: compliance_management
 value_type: number
 status: data_available
 time_frame: 7d
@@ -16,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183219_i_testing_paid_monthly_active_user_total.yml b/ee/config/metrics/counts_7d/20210216183219_i_testing_paid_monthly_active_user_total.yml
index a7006a71e2d11..a9e5f253d4f30 100644
--- a/ee/config/metrics/counts_7d/20210216183219_i_testing_paid_monthly_active_user_total.yml
+++ b/ee/config/metrics/counts_7d/20210216183219_i_testing_paid_monthly_active_user_total.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts_weekly.aggregated_metrics.i_testing_paid_monthly_active_user_total
-description: Aggregated count of users who have engaged with a Premium or Ultimate tier testing feature per week.
+description: Aggregated count of users who have engaged with a Premium or Ultimate
+  tier testing feature per week.
 product_section: ops
 product_stage: verify
 product_group: group::testing
@@ -16,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml b/ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml
index 480e87a468d6d..b18153967ed93 100644
--- a/ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml
@@ -1,7 +1,10 @@
 ---
 data_category: optional
 key_path: search_unique_visits.search_unique_visits_for_any_target_weekly
-description: Total unique users for i_search_total, i_search_advanced, i_search_paid for recent 7 days. This metric is redundant because advanced will be a subset of paid and paid will be a subset of total. i_search_total is more appropriate if you just want the total
+description: Total unique users for i_search_total, i_search_advanced, i_search_paid
+  for recent 7 days. This metric is redundant because advanced will be a subset of
+  paid and paid will be a subset of total. i_search_total is more appropriate if you
+  just want the total
 product_section: enablement
 product_stage: enablement
 product_group: group::global search
@@ -24,3 +27,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183924_g_compliance_dashboard_weekly.yml b/ee/config/metrics/counts_7d/20210216183924_g_compliance_dashboard_weekly.yml
index d746a3b2586a8..f40336b747aea 100644
--- a/ee/config/metrics/counts_7d/20210216183924_g_compliance_dashboard_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183924_g_compliance_dashboard_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.compliance.g_compliance_dashboard_weekly
-description: 'Unique users who have looked at the compliance report in a given week'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'compliance_management'
+description: Unique users who have looked at the compliance report in a given week
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: compliance_management
 value_type: number
 status: data_available
 time_frame: 7d
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183928_g_compliance_audit_events_weekly.yml b/ee/config/metrics/counts_7d/20210216183928_g_compliance_audit_events_weekly.yml
index 8b1db26a350da..1908273c1e34e 100644
--- a/ee/config/metrics/counts_7d/20210216183928_g_compliance_audit_events_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183928_g_compliance_audit_events_weekly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.compliance.g_compliance_audit_events_weekly
-description: 'Number of unique visitors to group-level audit events screen in a given week'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'audit_events'
+description: Number of unique visitors to group-level audit events screen in a given
+  week
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: audit_events
 value_type: number
 status: data_available
 time_frame: 7d
@@ -20,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183932_i_compliance_audit_events_weekly.yml b/ee/config/metrics/counts_7d/20210216183932_i_compliance_audit_events_weekly.yml
index 3cd33dca3a45d..bd9360310a280 100644
--- a/ee/config/metrics/counts_7d/20210216183932_i_compliance_audit_events_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183932_i_compliance_audit_events_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.compliance.i_compliance_audit_events_weekly
-description: 'Unique users that have viewed the instance-level audit events screen'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'audit_events'
+description: Unique users that have viewed the instance-level audit events screen
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: audit_events
 value_type: number
 status: data_available
 time_frame: 7d
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183936_i_compliance_credential_inventory_weekly.yml b/ee/config/metrics/counts_7d/20210216183936_i_compliance_credential_inventory_weekly.yml
index 2c3d9c49d153b..5c756f063c7c7 100644
--- a/ee/config/metrics/counts_7d/20210216183936_i_compliance_credential_inventory_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183936_i_compliance_credential_inventory_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.compliance.i_compliance_credential_inventory_weekly
-description: 'Unique visitors to the credential inventory screen in a given week'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'compliance_management'
+description: Unique visitors to the credential inventory screen in a given week
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: compliance_management
 value_type: number
 status: data_available
 time_frame: 7d
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183940_a_compliance_audit_events_api_weekly.yml b/ee/config/metrics/counts_7d/20210216183940_a_compliance_audit_events_api_weekly.yml
index a775a0f8f950a..c1bf961a44ab2 100644
--- a/ee/config/metrics/counts_7d/20210216183940_a_compliance_audit_events_api_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183940_a_compliance_audit_events_api_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.compliance.a_compliance_audit_events_api_weekly
-description: 'Unique users that have used the Audit Events API in a given week.'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'audit_events'
+description: Unique users that have used the Audit Events API in a given week.
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: audit_events
 value_type: number
 status: data_available
 time_frame: 7d
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml b/ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml
index 3c86d7df82277..5ab1fc445a3f7 100644
--- a/ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.compliance.compliance_total_unique_counts_weekly
-description: 'Unique count of compliance actions in a given week'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'compliance_management'
+description: Unique count of compliance actions in a given week
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: compliance_management
 value_type: number
 status: data_available
 time_frame: 7d
@@ -24,3 +24,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184033_i_search_paid_weekly.yml b/ee/config/metrics/counts_7d/20210216184033_i_search_paid_weekly.yml
index 5d8a3be4909a8..6989cdda04fa7 100644
--- a/ee/config/metrics/counts_7d/20210216184033_i_search_paid_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184033_i_search_paid_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.search.i_search_paid_weekly
-description: Calculated unique users to perform a search with a paid license enabled by week
+description: Calculated unique users to perform a search with a paid license enabled
+  by week
 product_section: enablement
 product_stage: enablement
 product_group: group::global search
@@ -20,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184132_i_testing_group_code_coverage_project_click_total_weekly.yml b/ee/config/metrics/counts_7d/20210216184132_i_testing_group_code_coverage_project_click_total_weekly.yml
index ce82dad41a407..dde3586388ba5 100644
--- a/ee/config/metrics/counts_7d/20210216184132_i_testing_group_code_coverage_project_click_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184132_i_testing_group_code_coverage_project_click_total_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.testing.i_testing_group_code_coverage_project_click_total_weekly
-description: Aggregated count of unique users who have clicked from group code coverage page to an individual project page each week.
+description: Aggregated count of unique users who have clicked from group code coverage
+  page to an individual project page each week.
 product_section: ops
 product_stage: verify
 product_group: group::testing
@@ -20,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184138_testing_total_unique_counts_weekly.yml b/ee/config/metrics/counts_7d/20210216184138_testing_total_unique_counts_weekly.yml
index 54c17e916eda6..70b5981b92bdf 100644
--- a/ee/config/metrics/counts_7d/20210216184138_testing_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184138_testing_total_unique_counts_weekly.yml
@@ -30,3 +30,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184221_g_project_management_issue_removed_from_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216184221_g_project_management_issue_removed_from_epic_weekly.yml
index 919e8caba28c8..b563a65ee235e 100644
--- a/ee/config/metrics/counts_7d/20210216184221_g_project_management_issue_removed_from_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184221_g_project_management_issue_removed_from_epic_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml b/ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml
index 192412deb32ed..c7660dc5d4838 100644
--- a/ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml b/ee/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
index 26de3a2d60512..4c74e9a0d3345 100644
--- a/ee/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml b/ee/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
index 2ef0285fd1a88..3c3fae23f8a4f 100644
--- a/ee/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_auto_devops
+  - p_ci_templates_implicit_auto_devops
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml b/ee/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
index 5eaf601df6d62..43798e1e97284 100644
--- a/ee/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_auto_devops_build
+  - p_ci_templates_implicit_auto_devops_build
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml b/ee/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
index ab88e86d71734..cb8793e733356 100644
--- a/ee/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_auto_devops_deploy
+  - p_ci_templates_implicit_auto_devops_deploy
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml b/ee/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
index 7157af96e2c86..892b41ad0a34e 100644
--- a/ee/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_security_sast
+  - p_ci_templates_implicit_security_sast
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml b/ee/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
index e796ff674e280..7027eed826215 100644
--- a/ee/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_security_secret_detection
+  - p_ci_templates_implicit_security_secret_detection
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml b/ee/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
index 2c5a80c07c3cd..719620e6e5f93 100644
--- a/ee/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_auto_devops
+  - p_ci_templates_auto_devops
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml b/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml
index 7d72c02f62642..4e34a7b51a1b1 100644
--- a/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml
@@ -13,13 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_auto_devops_build
-instrumentation_class: RedisHLLMetric
-options:
-  events:
-    - p_ci_templates_auto_devops
+  - p_ci_templates_auto_devops
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml b/ee/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
index f2e5bfb43e4a1..99a1e6cd1adc4 100644
--- a/ee/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
@@ -13,13 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_auto_devops_deploy
-instrumentation_class: RedisHLLMetric
-options:
-  events:
-    - p_ci_templates_auto_devops
+  - p_ci_templates_auto_devops
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml b/ee/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
index 8036f9b53e53b..653f6c170f1ab 100644
--- a/ee/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_auto_devops_deploy_latest
+  - p_ci_templates_auto_devops_deploy_latest
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml b/ee/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
index 5c5cc913626a2..f8074603cab10 100644
--- a/ee/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_security_sast
+  - p_ci_templates_security_sast
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml b/ee/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
index ab97b382c0c31..9a33ebe7c2c7e 100644
--- a/ee/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_security_secret_detection
+  - p_ci_templates_security_secret_detection
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml b/ee/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
index 44612b187a12b..16bd874a6876d 100644
--- a/ee/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_terraform_base_latest
+  - p_ci_templates_terraform_base_latest
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml b/ee/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
index 6ca11d4c0bbd4..af4ad5dd067e0 100644
--- a/ee/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
@@ -86,3 +86,4 @@ distribution:
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml b/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml
index 6ad80afb23b2c..ff929a2404a73 100644
--- a/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_list_issues_weekly
-description: 'Count of Jira Issue List visits by week'
+description: Count of Jira Issue List visits by week
 product_section: dev
 product_stage: ecosystem
 product_group: group::integrations
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_list_issues
+  - i_ecosystem_jira_service_list_issues
 distribution:
 - ee
 tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml b/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml
index 46656a0d33314..7bffbee82cd0f 100644
--- a/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_create_issue
+  - i_ecosystem_jira_service_create_issue
 distribution:
 - ee
 tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210204124854_license_management_jobs.yml b/ee/config/metrics/counts_all/20210204124854_license_management_jobs.yml
index 39db170756c70..c690a5563e2cc 100644
--- a/ee/config/metrics/counts_all/20210204124854_license_management_jobs.yml
+++ b/ee/config/metrics/counts_all/20210204124854_license_management_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174822_ldap_group_links.yml b/ee/config/metrics/counts_all/20210216174822_ldap_group_links.yml
index 70e6a72f586cc..a494be75ad45f 100644
--- a/ee/config/metrics/counts_all/20210216174822_ldap_group_links.yml
+++ b/ee/config/metrics/counts_all/20210216174822_ldap_group_links.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174824_ldap_keys.yml b/ee/config/metrics/counts_all/20210216174824_ldap_keys.yml
index 848d634effb52..d15ac9d827364 100644
--- a/ee/config/metrics/counts_all/20210216174824_ldap_keys.yml
+++ b/ee/config/metrics/counts_all/20210216174824_ldap_keys.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174826_ldap_users.yml b/ee/config/metrics/counts_all/20210216174826_ldap_users.yml
index 7153e2cf25772..58eae8c160685 100644
--- a/ee/config/metrics/counts_all/20210216174826_ldap_users.yml
+++ b/ee/config/metrics/counts_all/20210216174826_ldap_users.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml b/ee/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml
index c8c690a0d6f69..3e017b39af0cb 100644
--- a/ee/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml
+++ b/ee/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml
@@ -6,7 +6,7 @@ description: Total visits to /groups/:group/-/analytics/productivity_analytics a
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml b/ee/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml
index 11ef8347d1b7e..2e615e7d5e23f 100644
--- a/ee/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml
+++ b/ee/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /groups/:group/-/contribution_analytics
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174838_g_analytics_insights.yml b/ee/config/metrics/counts_all/20210216174838_g_analytics_insights.yml
index a6d66879d211e..4f1e89364cee8 100644
--- a/ee/config/metrics/counts_all/20210216174838_g_analytics_insights.yml
+++ b/ee/config/metrics/counts_all/20210216174838_g_analytics_insights.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /groups/:group/-/insights
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174840_g_analytics_issues.yml b/ee/config/metrics/counts_all/20210216174840_g_analytics_issues.yml
index 905a29442d787..f6c527ae0acef 100644
--- a/ee/config/metrics/counts_all/20210216174840_g_analytics_issues.yml
+++ b/ee/config/metrics/counts_all/20210216174840_g_analytics_issues.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /groups/:group/-/issues_analytics
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml b/ee/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml
index c5d8d1da42ae7..093c0e5fd980c 100644
--- a/ee/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml
+++ b/ee/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /groups/:group/-/analytics/productivity_analytic
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml b/ee/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml
index 454db04cdcee0..f8f4594f99d6f 100644
--- a/ee/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml
+++ b/ee/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /groups/:group/-/analytics/value_stream_analytic
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml b/ee/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml
index f4376f3dca8a4..a09e447a5a4ca 100644
--- a/ee/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml
+++ b/ee/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /:group/:project/-/analytics/code_reviews
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174852_p_analytics_insights.yml b/ee/config/metrics/counts_all/20210216174852_p_analytics_insights.yml
index fdf2ef882bda2..ebefb1ab9030f 100644
--- a/ee/config/metrics/counts_all/20210216174852_p_analytics_insights.yml
+++ b/ee/config/metrics/counts_all/20210216174852_p_analytics_insights.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /:group/:project/insights
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174854_p_analytics_issues.yml b/ee/config/metrics/counts_all/20210216174854_p_analytics_issues.yml
index 3acaf8557fb3d..ba87977c8e9f2 100644
--- a/ee/config/metrics/counts_all/20210216174854_p_analytics_issues.yml
+++ b/ee/config/metrics/counts_all/20210216174854_p_analytics_issues.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /:group/:project/-/analytics/issues_analytics
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml b/ee/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml
index 098f80368c5cd..62a1259d98029 100644
--- a/ee/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml
+++ b/ee/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /:group/:project/-/analytics/merge_request_analy
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175028_requirements_created.yml b/ee/config/metrics/counts_all/20210216175028_requirements_created.yml
index 7f6c56f4f85fe..5fe7202e939e2 100644
--- a/ee/config/metrics/counts_all/20210216175028_requirements_created.yml
+++ b/ee/config/metrics/counts_all/20210216175028_requirements_created.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175030_requirement_test_reports_manual.yml b/ee/config/metrics/counts_all/20210216175030_requirement_test_reports_manual.yml
index b1d1a4c060164..b08c36e476289 100644
--- a/ee/config/metrics/counts_all/20210216175030_requirement_test_reports_manual.yml
+++ b/ee/config/metrics/counts_all/20210216175030_requirement_test_reports_manual.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175032_requirement_test_reports_ci.yml b/ee/config/metrics/counts_all/20210216175032_requirement_test_reports_ci.yml
index dde08b308dd06..eaa710c685fdf 100644
--- a/ee/config/metrics/counts_all/20210216175032_requirement_test_reports_ci.yml
+++ b/ee/config/metrics/counts_all/20210216175032_requirement_test_reports_ci.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175034_requirements_with_test_report.yml b/ee/config/metrics/counts_all/20210216175034_requirements_with_test_report.yml
index 43a83be75504c..20c6c8c7b3d4a 100644
--- a/ee/config/metrics/counts_all/20210216175034_requirements_with_test_report.yml
+++ b/ee/config/metrics/counts_all/20210216175034_requirements_with_test_report.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175047_merge_requests_with_added_rules.yml b/ee/config/metrics/counts_all/20210216175047_merge_requests_with_added_rules.yml
index 926f6520234ed..7799b3d872767 100644
--- a/ee/config/metrics/counts_all/20210216175047_merge_requests_with_added_rules.yml
+++ b/ee/config/metrics/counts_all/20210216175047_merge_requests_with_added_rules.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175049_merge_requests_with_optional_codeowners.yml b/ee/config/metrics/counts_all/20210216175049_merge_requests_with_optional_codeowners.yml
index 1dbc50d29f49d..8a0e2a03a6e95 100644
--- a/ee/config/metrics/counts_all/20210216175049_merge_requests_with_optional_codeowners.yml
+++ b/ee/config/metrics/counts_all/20210216175049_merge_requests_with_optional_codeowners.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175051_merge_requests_with_required_codeowners.yml b/ee/config/metrics/counts_all/20210216175051_merge_requests_with_required_codeowners.yml
index 34301c3a1b0f5..ca4021e3be39f 100644
--- a/ee/config/metrics/counts_all/20210216175051_merge_requests_with_required_codeowners.yml
+++ b/ee/config/metrics/counts_all/20210216175051_merge_requests_with_required_codeowners.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175211_dependency_list_usages_total.yml b/ee/config/metrics/counts_all/20210216175211_dependency_list_usages_total.yml
index dab5ba933db8c..98b3d37263844 100644
--- a/ee/config/metrics/counts_all/20210216175211_dependency_list_usages_total.yml
+++ b/ee/config/metrics/counts_all/20210216175211_dependency_list_usages_total.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175213_dependency_scanning_jobs.yml b/ee/config/metrics/counts_all/20210216175213_dependency_scanning_jobs.yml
index 42a383fcff329..d08151cd47370 100644
--- a/ee/config/metrics/counts_all/20210216175213_dependency_scanning_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175213_dependency_scanning_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175216_user_dependency_scanning_jobs.yml b/ee/config/metrics/counts_all/20210216175216_user_dependency_scanning_jobs.yml
index 3a603ac93a563..205445ced6898 100644
--- a/ee/config/metrics/counts_all/20210216175216_user_dependency_scanning_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175216_user_dependency_scanning_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175218_user_license_management_jobs.yml b/ee/config/metrics/counts_all/20210216175218_user_license_management_jobs.yml
index 8774e96514edd..df2702eda1e4f 100644
--- a/ee/config/metrics/counts_all/20210216175218_user_license_management_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175218_user_license_management_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175220_dependency_scanning_scans.yml b/ee/config/metrics/counts_all/20210216175220_dependency_scanning_scans.yml
index 374ea8b5665e0..d1d1bb6f18230 100644
--- a/ee/config/metrics/counts_all/20210216175220_dependency_scanning_scans.yml
+++ b/ee/config/metrics/counts_all/20210216175220_dependency_scanning_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175316_kubernetes_agents.yml b/ee/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
index be006554c5fcc..e5210901083ab 100644
--- a/ee/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
+++ b/ee/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml b/ee/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
index 0f1c4ee234c2b..a0bc5402cbff5 100644
--- a/ee/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
+++ b/ee/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175328_kubernetes_agent_gitops_sync.yml b/ee/config/metrics/counts_all/20210216175328_kubernetes_agent_gitops_sync.yml
index 61b7f78f8b5ad..a60659293548e 100644
--- a/ee/config/metrics/counts_all/20210216175328_kubernetes_agent_gitops_sync.yml
+++ b/ee/config/metrics/counts_all/20210216175328_kubernetes_agent_gitops_sync.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175400_projects_slack_notifications_active.yml b/ee/config/metrics/counts_all/20210216175400_projects_slack_notifications_active.yml
index 70682d96b1204..50b5eacad0c2c 100644
--- a/ee/config/metrics/counts_all/20210216175400_projects_slack_notifications_active.yml
+++ b/ee/config/metrics/counts_all/20210216175400_projects_slack_notifications_active.yml
@@ -3,15 +3,16 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.projects_slack_notifications_active
 description: Unique projects with Slack webhook enabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: chatops
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml b/ee/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml
index f7d70d7bf4b1a..a8076b23e157e 100644
--- a/ee/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml
+++ b/ee/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml
@@ -3,15 +3,16 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.projects_slack_slash_active
 description: Unique projects with Slack ‘/’ commands enabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: chatops
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175441_ingress_modsecurity_statistics_unavailable.yml b/ee/config/metrics/counts_all/20210216175441_ingress_modsecurity_statistics_unavailable.yml
index 1acfff370d093..176018d217b39 100644
--- a/ee/config/metrics/counts_all/20210216175441_ingress_modsecurity_statistics_unavailable.yml
+++ b/ee/config/metrics/counts_all/20210216175441_ingress_modsecurity_statistics_unavailable.yml
@@ -16,3 +16,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175458_container_scanning_jobs.yml b/ee/config/metrics/counts_all/20210216175458_container_scanning_jobs.yml
index a7049d65e0337..b9a04f046041a 100644
--- a/ee/config/metrics/counts_all/20210216175458_container_scanning_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175458_container_scanning_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175501_user_container_scanning_jobs.yml b/ee/config/metrics/counts_all/20210216175501_user_container_scanning_jobs.yml
index 9523e93bf8d7b..5cc7c13a079ab 100644
--- a/ee/config/metrics/counts_all/20210216175501_user_container_scanning_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175501_user_container_scanning_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175503_container_scanning_scans.yml b/ee/config/metrics/counts_all/20210216175503_container_scanning_scans.yml
index 56a2516db96e8..3239085690f64 100644
--- a/ee/config/metrics/counts_all/20210216175503_container_scanning_scans.yml
+++ b/ee/config/metrics/counts_all/20210216175503_container_scanning_scans.yml
@@ -1,7 +1,7 @@
 ---
 data_category: operational
 key_path: usage_activity_by_stage.secure.container_scanning_scans
-description: 'Counts container scanning jobs'
+description: Counts container scanning jobs
 product_section: sec
 product_stage: protect
 product_group: group::container security
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175540_projects_reporting_ci_cd_back_to_github.yml b/ee/config/metrics/counts_all/20210216175540_projects_reporting_ci_cd_back_to_github.yml
index f4245d57557d6..2dc0069554555 100644
--- a/ee/config/metrics/counts_all/20210216175540_projects_reporting_ci_cd_back_to_github.yml
+++ b/ee/config/metrics/counts_all/20210216175540_projects_reporting_ci_cd_back_to_github.yml
@@ -9,7 +9,7 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ee
 tier:
@@ -17,3 +17,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175612_dast_jobs.yml b/ee/config/metrics/counts_all/20210216175612_dast_jobs.yml
index a2fdb0f76a5f9..3d740b62b6a1b 100644
--- a/ee/config/metrics/counts_all/20210216175612_dast_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175612_dast_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175614_user_dast_jobs.yml b/ee/config/metrics/counts_all/20210216175614_user_dast_jobs.yml
index ab0ed503d62e6..5853146b6f167 100644
--- a/ee/config/metrics/counts_all/20210216175614_user_dast_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175614_user_dast_jobs.yml
@@ -14,3 +14,4 @@ distribution:
 - ee
 tier:
 - ultimate
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml b/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml
index 2b705d4c6f8bb..5e5dfe0116627 100644
--- a/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175850_groups_github_active.yml b/ee/config/metrics/counts_all/20210216175850_groups_github_active.yml
index a4b0318b18f3b..c3dec0a2fc31d 100644
--- a/ee/config/metrics/counts_all/20210216175850_groups_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175850_groups_github_active.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175851_templates_github_active.yml b/ee/config/metrics/counts_all/20210216175851_templates_github_active.yml
index aab6af553dd47..27c5a43df61c0 100644
--- a/ee/config/metrics/counts_all/20210216175851_templates_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175851_templates_github_active.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175853_instances_github_active.yml b/ee/config/metrics/counts_all/20210216175853_instances_github_active.yml
index a90f49c6b64d5..9bd6b605edb0a 100644
--- a/ee/config/metrics/counts_all/20210216175853_instances_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175853_instances_github_active.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml b/ee/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml
index 39c0b9177eccb..8fb2acf647b76 100644
--- a/ee/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml b/ee/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml
index 3ca868991b116..d4ae732f6ce85 100644
--- a/ee/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180236_projects_jira_issuelist_active.yml b/ee/config/metrics/counts_all/20210216180236_projects_jira_issuelist_active.yml
index f6b4f03961fa5..e5e54ee1f01ca 100644
--- a/ee/config/metrics/counts_all/20210216180236_projects_jira_issuelist_active.yml
+++ b/ee/config/metrics/counts_all/20210216180236_projects_jira_issuelist_active.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml b/ee/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml
index e18253d25d633..59f68cf8c6efb 100644
--- a/ee/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml b/ee/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml
index 297f7ffca52fe..a0753565cde7e 100644
--- a/ee/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml
@@ -11,6 +11,7 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ee
+- ee
 tier:
-  - ultimate
+- ultimate
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml b/ee/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml
index 3e41732091040..aee60ee3d1418 100644
--- a/ee/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml
@@ -14,3 +14,4 @@ distribution:
 - ee
 tier:
 - ultimate
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml b/ee/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml
index 1145622a968ce..928f05889899d 100644
--- a/ee/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml
@@ -14,3 +14,4 @@ distribution:
 - ee
 tier:
 - ultimate
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180352_coverage_fuzzing_scans.yml b/ee/config/metrics/counts_all/20210216180352_coverage_fuzzing_scans.yml
index 18e1eb4577774..e750df9a2c42b 100644
--- a/ee/config/metrics/counts_all/20210216180352_coverage_fuzzing_scans.yml
+++ b/ee/config/metrics/counts_all/20210216180352_coverage_fuzzing_scans.yml
@@ -11,7 +11,8 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ee
+- ee
 tier:
-  - ultimate
+- ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180353_api_fuzzing_scans.yml b/ee/config/metrics/counts_all/20210216180353_api_fuzzing_scans.yml
index f2af60fa22932..dd710a02a975b 100644
--- a/ee/config/metrics/counts_all/20210216180353_api_fuzzing_scans.yml
+++ b/ee/config/metrics/counts_all/20210216180353_api_fuzzing_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180405_geo_event_log_max_id.yml b/ee/config/metrics/counts_all/20210216180405_geo_event_log_max_id.yml
index 4710b92c32f95..94abe7515b073 100644
--- a/ee/config/metrics/counts_all/20210216180405_geo_event_log_max_id.yml
+++ b/ee/config/metrics/counts_all/20210216180405_geo_event_log_max_id.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180418_i_search_advanced.yml b/ee/config/metrics/counts_all/20210216180418_i_search_advanced.yml
index cf33b4a87c5e0..82b4f5b231cd5 100644
--- a/ee/config/metrics/counts_all/20210216180418_i_search_advanced.yml
+++ b/ee/config/metrics/counts_all/20210216180418_i_search_advanced.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180420_i_search_paid.yml b/ee/config/metrics/counts_all/20210216180420_i_search_paid.yml
index 5c48aad0fb3b3..8a3e91b881aac 100644
--- a/ee/config/metrics/counts_all/20210216180420_i_search_paid.yml
+++ b/ee/config/metrics/counts_all/20210216180420_i_search_paid.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml b/ee/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml
index 0466db8a4db5e..0e7c3ff66db6d 100644
--- a/ee/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml
+++ b/ee/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml b/ee/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml
index 3871a3df3d788..a242e21ac9d33 100644
--- a/ee/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml
+++ b/ee/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180506_status_page_projects.yml b/ee/config/metrics/counts_all/20210216180506_status_page_projects.yml
index 6028fca3fc292..b175593570c22 100644
--- a/ee/config/metrics/counts_all/20210216180506_status_page_projects.yml
+++ b/ee/config/metrics/counts_all/20210216180506_status_page_projects.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180507_status_page_issues.yml b/ee/config/metrics/counts_all/20210216180507_status_page_issues.yml
index 70622a5774327..f412d1e308929 100644
--- a/ee/config/metrics/counts_all/20210216180507_status_page_issues.yml
+++ b/ee/config/metrics/counts_all/20210216180507_status_page_issues.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml b/ee/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml
index ea36c0efeb858..1e4e78588013c 100644
--- a/ee/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180800_ldap_keys.yml b/ee/config/metrics/counts_all/20210216180800_ldap_keys.yml
index faf2239e44404..11d7e2ac2f94e 100644
--- a/ee/config/metrics/counts_all/20210216180800_ldap_keys.yml
+++ b/ee/config/metrics/counts_all/20210216180800_ldap_keys.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180801_ldap_users.yml b/ee/config/metrics/counts_all/20210216180801_ldap_users.yml
index bcb71c5a31541..aca927d966a4d 100644
--- a/ee/config/metrics/counts_all/20210216180801_ldap_users.yml
+++ b/ee/config/metrics/counts_all/20210216180801_ldap_users.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180803_value_stream_management_customized_group_stages.yml b/ee/config/metrics/counts_all/20210216180803_value_stream_management_customized_group_stages.yml
index 806dc0b1649e2..460d85651052e 100644
--- a/ee/config/metrics/counts_all/20210216180803_value_stream_management_customized_group_stages.yml
+++ b/ee/config/metrics/counts_all/20210216180803_value_stream_management_customized_group_stages.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180805_projects_with_compliance_framework.yml b/ee/config/metrics/counts_all/20210216180805_projects_with_compliance_framework.yml
index 0dbda64d7e6e8..5fbf69aaa6e0a 100644
--- a/ee/config/metrics/counts_all/20210216180805_projects_with_compliance_framework.yml
+++ b/ee/config/metrics/counts_all/20210216180805_projects_with_compliance_framework.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180807_ldap_servers.yml b/ee/config/metrics/counts_all/20210216180807_ldap_servers.yml
index 85fcf7aa903cb..64cc187b83f21 100644
--- a/ee/config/metrics/counts_all/20210216180807_ldap_servers.yml
+++ b/ee/config/metrics/counts_all/20210216180807_ldap_servers.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181100_assignee_lists.yml b/ee/config/metrics/counts_all/20210216181100_assignee_lists.yml
index a74fd3bd49a77..e7837157af725 100644
--- a/ee/config/metrics/counts_all/20210216181100_assignee_lists.yml
+++ b/ee/config/metrics/counts_all/20210216181100_assignee_lists.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181106_milestone_lists.yml b/ee/config/metrics/counts_all/20210216181106_milestone_lists.yml
index 4a47690983236..9e323fbc56a34 100644
--- a/ee/config/metrics/counts_all/20210216181106_milestone_lists.yml
+++ b/ee/config/metrics/counts_all/20210216181106_milestone_lists.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181132_assignee_lists.yml b/ee/config/metrics/counts_all/20210216181132_assignee_lists.yml
index 28170664f51d6..9a8603fb7494a 100644
--- a/ee/config/metrics/counts_all/20210216181132_assignee_lists.yml
+++ b/ee/config/metrics/counts_all/20210216181132_assignee_lists.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181137_milestone_lists.yml b/ee/config/metrics/counts_all/20210216181137_milestone_lists.yml
index 6d7264029b91b..f614ee26553c1 100644
--- a/ee/config/metrics/counts_all/20210216181137_milestone_lists.yml
+++ b/ee/config/metrics/counts_all/20210216181137_milestone_lists.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181205_confidential_epics.yml b/ee/config/metrics/counts_all/20210216181205_confidential_epics.yml
index c6ae7aabf3b28..6e31acca5ab85 100644
--- a/ee/config/metrics/counts_all/20210216181205_confidential_epics.yml
+++ b/ee/config/metrics/counts_all/20210216181205_confidential_epics.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181206_epics.yml b/ee/config/metrics/counts_all/20210216181206_epics.yml
index a6ffd66554dc5..3f1d43ea3513a 100644
--- a/ee/config/metrics/counts_all/20210216181206_epics.yml
+++ b/ee/config/metrics/counts_all/20210216181206_epics.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181208_epic_issues.yml b/ee/config/metrics/counts_all/20210216181208_epic_issues.yml
index fdf4558730897..0d988f1751a9e 100644
--- a/ee/config/metrics/counts_all/20210216181208_epic_issues.yml
+++ b/ee/config/metrics/counts_all/20210216181208_epic_issues.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181210_issues_with_health_status.yml b/ee/config/metrics/counts_all/20210216181210_issues_with_health_status.yml
index 60f6299719200..7ee864b5c9c2e 100644
--- a/ee/config/metrics/counts_all/20210216181210_issues_with_health_status.yml
+++ b/ee/config/metrics/counts_all/20210216181210_issues_with_health_status.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181212_epics_deepest_relationship_level.yml b/ee/config/metrics/counts_all/20210216181212_epics_deepest_relationship_level.yml
index a7b86b94f1f87..e2592ab68e0dc 100644
--- a/ee/config/metrics/counts_all/20210216181212_epics_deepest_relationship_level.yml
+++ b/ee/config/metrics/counts_all/20210216181212_epics_deepest_relationship_level.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml b/ee/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml
index 3a371616db794..833e074dbf65c 100644
--- a/ee/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml
@@ -5,7 +5,7 @@ description: Projects with repository mirroring enabled
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml b/ee/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml
index fe17de9b4eae6..2c38ee9d320ec 100644
--- a/ee/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml
@@ -5,7 +5,7 @@ description: Count creator_id from projects with repository mirroring enabled.
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml b/ee/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
index d58eb1e509eda..cef1b7b26141f 100644
--- a/ee/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182001_protected_branches.yml b/ee/config/metrics/counts_all/20210216182001_protected_branches.yml
index a19c88d8a7993..6f1130517a189 100644
--- a/ee/config/metrics/counts_all/20210216182001_protected_branches.yml
+++ b/ee/config/metrics/counts_all/20210216182001_protected_branches.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182008_template_repositories.yml b/ee/config/metrics/counts_all/20210216182008_template_repositories.yml
index 30f2772767401..b74bca7cfc9c8 100644
--- a/ee/config/metrics/counts_all/20210216182008_template_repositories.yml
+++ b/ee/config/metrics/counts_all/20210216182008_template_repositories.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml b/ee/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
index 02c93956f075a..7b360152e77f6 100644
--- a/ee/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
+++ b/ee/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml b/ee/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml
index 4bd0c2d11cbfa..1d586e2316d64 100644
--- a/ee/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml
+++ b/ee/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml b/ee/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml
index f628bae594fad..a3084398c7969 100644
--- a/ee/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182025_protected_branches.yml b/ee/config/metrics/counts_all/20210216182025_protected_branches.yml
index d7b5d76952a7d..8f66a1b970935 100644
--- a/ee/config/metrics/counts_all/20210216182025_protected_branches.yml
+++ b/ee/config/metrics/counts_all/20210216182025_protected_branches.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml b/ee/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml
index 4c8e38a01b1d8..1bf56dc312064 100644
--- a/ee/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml
+++ b/ee/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml b/ee/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml
index 61e352cae9d38..6b231b9183e14 100644
--- a/ee/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml
+++ b/ee/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182030_approval_project_rules.yml b/ee/config/metrics/counts_all/20210216182030_approval_project_rules.yml
index 7c11a06a94d4f..cf6e42adae6ad 100644
--- a/ee/config/metrics/counts_all/20210216182030_approval_project_rules.yml
+++ b/ee/config/metrics/counts_all/20210216182030_approval_project_rules.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182032_approval_project_rules_with_target_branch.yml b/ee/config/metrics/counts_all/20210216182032_approval_project_rules_with_target_branch.yml
index e34b9c0faf542..01e7e66093fef 100644
--- a/ee/config/metrics/counts_all/20210216182032_approval_project_rules_with_target_branch.yml
+++ b/ee/config/metrics/counts_all/20210216182032_approval_project_rules_with_target_branch.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182120_sast_scans.yml b/ee/config/metrics/counts_all/20210216182120_sast_scans.yml
index bce8e3c17f06e..2c472f1073fe0 100644
--- a/ee/config/metrics/counts_all/20210216182120_sast_scans.yml
+++ b/ee/config/metrics/counts_all/20210216182120_sast_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182122_dast_scans.yml b/ee/config/metrics/counts_all/20210216182122_dast_scans.yml
index d643eec346d58..5be4811dd468e 100644
--- a/ee/config/metrics/counts_all/20210216182122_dast_scans.yml
+++ b/ee/config/metrics/counts_all/20210216182122_dast_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182123_secret_detection_scans.yml b/ee/config/metrics/counts_all/20210216182123_secret_detection_scans.yml
index 15b10171745e9..871fb7b26faea 100644
--- a/ee/config/metrics/counts_all/20210216182123_secret_detection_scans.yml
+++ b/ee/config/metrics/counts_all/20210216182123_secret_detection_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182203_user_preferences_group_overview_details.yml b/ee/config/metrics/counts_all/20210216182203_user_preferences_group_overview_details.yml
index c599083b178fb..f830e232820e2 100644
--- a/ee/config/metrics/counts_all/20210216182203_user_preferences_group_overview_details.yml
+++ b/ee/config/metrics/counts_all/20210216182203_user_preferences_group_overview_details.yml
@@ -16,3 +16,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182205_user_preferences_group_overview_security_dashboard.yml b/ee/config/metrics/counts_all/20210216182205_user_preferences_group_overview_security_dashboard.yml
index 6f673a8084e9f..d5633250b06a3 100644
--- a/ee/config/metrics/counts_all/20210216182205_user_preferences_group_overview_security_dashboard.yml
+++ b/ee/config/metrics/counts_all/20210216182205_user_preferences_group_overview_security_dashboard.yml
@@ -16,3 +16,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182207_user_preferences_group_overview_security_dashboard.yml b/ee/config/metrics/counts_all/20210216182207_user_preferences_group_overview_security_dashboard.yml
index ac88b9b67bb06..f851804842663 100644
--- a/ee/config/metrics/counts_all/20210216182207_user_preferences_group_overview_security_dashboard.yml
+++ b/ee/config/metrics/counts_all/20210216182207_user_preferences_group_overview_security_dashboard.yml
@@ -16,3 +16,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182212_projects_reporting_ci_cd_back_to_github.yml b/ee/config/metrics/counts_all/20210216182212_projects_reporting_ci_cd_back_to_github.yml
index 9f050225d8fed..ea3e0b88f338a 100644
--- a/ee/config/metrics/counts_all/20210216182212_projects_reporting_ci_cd_back_to_github.yml
+++ b/ee/config/metrics/counts_all/20210216182212_projects_reporting_ci_cd_back_to_github.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml b/ee/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml
index 9118c50e96ee6..3fb11c8a45fd1 100644
--- a/ee/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml b/ee/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml
index c592d9356c966..6c4d5d58df76d 100644
--- a/ee/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml
+++ b/ee/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml
@@ -14,3 +14,4 @@ distribution:
 - ee
 tier:
 - ultimate
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml b/ee/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml
index 732595b18351f..67bd69a79ba8a 100644
--- a/ee/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml
+++ b/ee/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183344_users_using_path_locks.yml b/ee/config/metrics/counts_all/20210216183344_users_using_path_locks.yml
index 9c97d29a3b91c..dcf0da36fd5f1 100644
--- a/ee/config/metrics/counts_all/20210216183344_users_using_path_locks.yml
+++ b/ee/config/metrics/counts_all/20210216183344_users_using_path_locks.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml b/ee/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml
index d20ca96469a42..b2344432fafbc 100644
--- a/ee/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml
+++ b/ee/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml b/ee/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml
index f41a62a220f35..8a1a5d7eaee72 100644
--- a/ee/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml
+++ b/ee/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml b/ee/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml
index 0d22e40f0877d..b457fcf43b328 100644
--- a/ee/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml
+++ b/ee/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml b/ee/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml
index eda838a116d98..d6b639c8d03be 100644
--- a/ee/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml
+++ b/ee/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml b/ee/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml
index 081eaf1e84a36..36908c9ef4359 100644
--- a/ee/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml
@@ -14,3 +14,4 @@ distribution:
 - ee
 tier:
 - ultimate
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml b/ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml
index 56c36a574290f..725251299b0b8 100644
--- a/ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_incident_sla_enabled
 description: Count of projects with Incident SLA enabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183904_g_compliance_dashboard.yml b/ee/config/metrics/counts_all/20210216183904_g_compliance_dashboard.yml
index 19f0911ea7950..1adf1add5b512 100644
--- a/ee/config/metrics/counts_all/20210216183904_g_compliance_dashboard.yml
+++ b/ee/config/metrics/counts_all/20210216183904_g_compliance_dashboard.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: compliance_unique_visits.g_compliance_dashboard
-description: 'Number of unique visitors to the compliance dashboard.'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'compliance_management'
+description: Number of unique visitors to the compliance dashboard.
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: compliance_management
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183906_g_compliance_audit_events.yml b/ee/config/metrics/counts_all/20210216183906_g_compliance_audit_events.yml
index 5b8ef30ec9482..029fa642aaefc 100644
--- a/ee/config/metrics/counts_all/20210216183906_g_compliance_audit_events.yml
+++ b/ee/config/metrics/counts_all/20210216183906_g_compliance_audit_events.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: compliance_unique_visits.g_compliance_audit_events
-description: 'Unique users who have viewed audit events'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'audit_events'
+description: Unique users who have viewed audit events
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: audit_events
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183908_i_compliance_audit_events.yml b/ee/config/metrics/counts_all/20210216183908_i_compliance_audit_events.yml
index e740c2f134f78..723bd2a15cb37 100644
--- a/ee/config/metrics/counts_all/20210216183908_i_compliance_audit_events.yml
+++ b/ee/config/metrics/counts_all/20210216183908_i_compliance_audit_events.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: compliance_unique_visits.i_compliance_audit_events
-description: 'Unique users that have viewed the instance-level audit events screen'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'audit_events'
+description: Unique users that have viewed the instance-level audit events screen
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: audit_events
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183910_i_compliance_credential_inventory.yml b/ee/config/metrics/counts_all/20210216183910_i_compliance_credential_inventory.yml
index 4c3c54d073cd0..4a71e06ff0f20 100644
--- a/ee/config/metrics/counts_all/20210216183910_i_compliance_credential_inventory.yml
+++ b/ee/config/metrics/counts_all/20210216183910_i_compliance_credential_inventory.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: compliance_unique_visits.i_compliance_credential_inventory
-description: 'Unique users who have viewed the credential inventory'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'compliance_management'
+description: Unique users who have viewed the credential inventory
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: compliance_management
 value_type: number
 status: data_available
 time_frame: all
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183912_a_compliance_audit_events_api.yml b/ee/config/metrics/counts_all/20210216183912_a_compliance_audit_events_api.yml
index c1e13176c4a09..58f7f0ebf03ba 100644
--- a/ee/config/metrics/counts_all/20210216183912_a_compliance_audit_events_api.yml
+++ b/ee/config/metrics/counts_all/20210216183912_a_compliance_audit_events_api.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: compliance_unique_visits.a_compliance_audit_events_api
-description: 'Unique users that have used the Audit Events API.'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'audit_events'
+description: Unique users that have used the Audit Events API.
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: audit_events
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183914_compliance_unique_visits_for_any_target.yml b/ee/config/metrics/counts_all/20210216183914_compliance_unique_visits_for_any_target.yml
index 9311977622b5d..d5f5c98bb380c 100644
--- a/ee/config/metrics/counts_all/20210216183914_compliance_unique_visits_for_any_target.yml
+++ b/ee/config/metrics/counts_all/20210216183914_compliance_unique_visits_for_any_target.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: compliance_unique_visits.compliance_unique_visits_for_any_target
-description: 'Number of unique visits to any compliance page'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'compliance_management'
+description: Number of unique visits to any compliance page
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: compliance_management
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216184035_i_search_paid_monthly.yml b/ee/config/metrics/counts_all/20210216184035_i_search_paid_monthly.yml
index c998d8c4897cb..a80de39c6619d 100644
--- a/ee/config/metrics/counts_all/20210216184035_i_search_paid_monthly.yml
+++ b/ee/config/metrics/counts_all/20210216184035_i_search_paid_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - ultimate
 performance_indicator_type:
 - paid_gmau
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124831_license_md5.yml b/ee/config/metrics/license/20210204124831_license_md5.yml
index 1b698d6cb718e..4bc364e875f93 100644
--- a/ee/config/metrics/license/20210204124831_license_md5.yml
+++ b/ee/config/metrics/license/20210204124831_license_md5.yml
@@ -9,7 +9,7 @@ value_type: string
 status: data_available
 time_frame: none
 data_source: license
-instrumentation_class: 'LicenseMdFiveMetric'
+instrumentation_class: LicenseMdFiveMetric
 data_category: standard
 distribution:
 - ee
@@ -18,3 +18,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124833_license_id.yml b/ee/config/metrics/license/20210204124833_license_id.yml
index a367c60adccd7..d6a4d628f92d0 100644
--- a/ee/config/metrics/license/20210204124833_license_id.yml
+++ b/ee/config/metrics/license/20210204124833_license_id.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124835_historical_max_users.yml b/ee/config/metrics/license/20210204124835_historical_max_users.yml
index 5e062967e4174..a3b7b3bb848aa 100644
--- a/ee/config/metrics/license/20210204124835_historical_max_users.yml
+++ b/ee/config/metrics/license/20210204124835_historical_max_users.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124837_name.yml b/ee/config/metrics/license/20210204124837_name.yml
index 5f10a77dcd586..49cb3af39afc7 100644
--- a/ee/config/metrics/license/20210204124837_name.yml
+++ b/ee/config/metrics/license/20210204124837_name.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124839_email.yml b/ee/config/metrics/license/20210204124839_email.yml
index cdf650bb6fe0f..af68e73112116 100644
--- a/ee/config/metrics/license/20210204124839_email.yml
+++ b/ee/config/metrics/license/20210204124839_email.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124841_company.yml b/ee/config/metrics/license/20210204124841_company.yml
index 06bf1d5bed843..61792160f9c28 100644
--- a/ee/config/metrics/license/20210204124841_company.yml
+++ b/ee/config/metrics/license/20210204124841_company.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124843_license_user_count.yml b/ee/config/metrics/license/20210204124843_license_user_count.yml
index f377003287dd2..6e8a83053db41 100644
--- a/ee/config/metrics/license/20210204124843_license_user_count.yml
+++ b/ee/config/metrics/license/20210204124843_license_user_count.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124845_license_starts_at.yml b/ee/config/metrics/license/20210204124845_license_starts_at.yml
index bb7d2c0510811..cfaba8fb95290 100644
--- a/ee/config/metrics/license/20210204124845_license_starts_at.yml
+++ b/ee/config/metrics/license/20210204124845_license_starts_at.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124847_license_expires_at.yml b/ee/config/metrics/license/20210204124847_license_expires_at.yml
index 8079a4290301c..0d169968b5206 100644
--- a/ee/config/metrics/license/20210204124847_license_expires_at.yml
+++ b/ee/config/metrics/license/20210204124847_license_expires_at.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124849_license_plan.yml b/ee/config/metrics/license/20210204124849_license_plan.yml
index a7932f87ff1bf..b5e3a2d8647c6 100644
--- a/ee/config/metrics/license/20210204124849_license_plan.yml
+++ b/ee/config/metrics/license/20210204124849_license_plan.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124851_license_trial.yml b/ee/config/metrics/license/20210204124851_license_trial.yml
index db3ee18dd8cfb..2c7de4eb63811 100644
--- a/ee/config/metrics/license/20210204124851_license_trial.yml
+++ b/ee/config/metrics/license/20210204124851_license_trial.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124852_license_subscription_id.yml b/ee/config/metrics/license/20210204124852_license_subscription_id.yml
index 65e745f0715fa..16798bd8c4394 100644
--- a/ee/config/metrics/license/20210204124852_license_subscription_id.yml
+++ b/ee/config/metrics/license/20210204124852_license_subscription_id.yml
@@ -9,7 +9,7 @@ value_type: string
 status: data_available
 time_frame: none
 data_source: license
-instrumentation_class: 'ZuoraSubscriptionIdMetric'
+instrumentation_class: ZuoraSubscriptionIdMetric
 data_category: standard
 distribution:
 - ee
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124926_license_trial_ends_on.yml b/ee/config/metrics/license/20210204124926_license_trial_ends_on.yml
index 93b776cc3952d..3809ad741f274 100644
--- a/ee/config/metrics/license/20210204124926_license_trial_ends_on.yml
+++ b/ee/config/metrics/license/20210204124926_license_trial_ends_on.yml
@@ -18,3 +18,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22279
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210216175210_licenses_list_views.yml b/ee/config/metrics/license/20210216175210_licenses_list_views.yml
index 00edac2c3caf9..cb48cdf813e71 100644
--- a/ee/config/metrics/license/20210216175210_licenses_list_views.yml
+++ b/ee/config/metrics/license/20210216175210_licenses_list_views.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/settings/20210204124924_elasticsearch_enabled.yml b/ee/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
index fbaf66db3677e..a0959ebe90ef7 100644
--- a/ee/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
+++ b/ee/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/settings/20210216180406_geo_enabled.yml b/ee/config/metrics/settings/20210216180406_geo_enabled.yml
index f1a9857de8ca0..893c33d4bb55e 100644
--- a/ee/config/metrics/settings/20210216180406_geo_enabled.yml
+++ b/ee/config/metrics/settings/20210216180406_geo_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/settings/20210216180809_ldap_group_sync_enabled.yml b/ee/config/metrics/settings/20210216180809_ldap_group_sync_enabled.yml
index 97da30f36d344..182012949255d 100644
--- a/ee/config/metrics/settings/20210216180809_ldap_group_sync_enabled.yml
+++ b/ee/config/metrics/settings/20210216180809_ldap_group_sync_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/settings/20210216180811_ldap_admin_sync_enabled.yml b/ee/config/metrics/settings/20210216180811_ldap_admin_sync_enabled.yml
index 859b723aab7dd..a1bc21d79a978 100644
--- a/ee/config/metrics/settings/20210216180811_ldap_admin_sync_enabled.yml
+++ b/ee/config/metrics/settings/20210216180811_ldap_admin_sync_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/settings/20210216180813_group_saml_enabled.yml b/ee/config/metrics/settings/20210216180813_group_saml_enabled.yml
index ac18a0aafa82c..b06df67b8fa44 100644
--- a/ee/config/metrics/settings/20210216180813_group_saml_enabled.yml
+++ b/ee/config/metrics/settings/20210216180813_group_saml_enabled.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.group_saml_enabled
-description: Has the instance enabled Group SAML SSO `https://docs.gitlab.com/ee/user/group/saml_sso/` on at least 1 group?
+description: Has the instance enabled Group SAML SSO `https://docs.gitlab.com/ee/user/group/saml_sso/`
+  on at least 1 group?
 product_section: dev
-product_stage: 
+product_stage:
 product_group: group::manage
-product_category: 
+product_category:
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,3 +17,4 @@ tier:
 - premium
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/settings/20210216180829_ldap_group_sync_enabled.yml b/ee/config/metrics/settings/20210216180829_ldap_group_sync_enabled.yml
index 568f7ddc8a3cc..81e1068c18c21 100644
--- a/ee/config/metrics/settings/20210216180829_ldap_group_sync_enabled.yml
+++ b/ee/config/metrics/settings/20210216180829_ldap_group_sync_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/settings/20210216180831_ldap_admin_sync_enabled.yml b/ee/config/metrics/settings/20210216180831_ldap_admin_sync_enabled.yml
index 98bb69f2fcd62..e22c1de8babb6 100644
--- a/ee/config/metrics/settings/20210216180831_ldap_admin_sync_enabled.yml
+++ b/ee/config/metrics/settings/20210216180831_ldap_admin_sync_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/settings/20210216180833_group_saml_enabled.yml b/ee/config/metrics/settings/20210216180833_group_saml_enabled.yml
index eda55fcddca6c..5cd5c850e28a3 100644
--- a/ee/config/metrics/settings/20210216180833_group_saml_enabled.yml
+++ b/ee/config/metrics/settings/20210216180833_group_saml_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
-- 
GitLab